diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index fb28f16016d8..bcc9f9164eef 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,3 +1 @@
-DIST ansible-2.3.0.0-pycryptodome.patch 32449 SHA256 a87d712305160ef8a559bf9e27d7fe4361889f45da5ba501c4a9ae8c6c58e504 SHA512 f52611275262d772b2e44b858c59590ab18ed29c22899c0d8b47f3a21c71aebff9aab1a2284bdf44fbc47b63c3836851db1c065bafe0b6883bb582a98cf4d0a4 WHIRLPOOL bd344c2507eb8576a114e5618d182b90443a92d4cd57f27310eb495dbba123853503c64c69338a02ce680b615862c819985913f2860e3dde670ef929dcd5761f
-DIST ansible-2.3.0.0.tar.gz 4251730 SHA256 299f3907cd566a20e163942fa82b6afc86ef89c2726ba503b90c1a651e82a458 SHA512 88ac28befefd7a70c36d8c33bc1aba1b0a5ffdea4bddd0b9e6c5488c70057662812208c221e47721c5a194fc30282a33490f196a719d9eb6d9b1e7dcfd1ff941 WHIRLPOOL a6a622f17476c07e3446a7b09631027797ade04f7d1571e0eafccc2736390deabfcdd36fa1e849d209eb7ab5f1e3e86f2b6e7dd3032db1743665165c1dc710ba
 DIST ansible-2.3.1.0.tar.gz 4263357 SHA256 cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5 SHA512 7b4b33c56a15c41d756f095944d7a0dbf894557350879430df21061b717b9574aae624a276bf7e1a13d043b718aeaccac1ce510a3cb085983311ddf06fa832bc WHIRLPOOL 5552ff64e8cac722a705bd1e72465c8bfe583a1c5efc587ca141b34eaa35d2af0ea2e1084a072ecb7dbb28d59d7f56e47c4c73f9e3e0f7f2451ef4e7134ad1af
diff --git a/app-admin/ansible/ansible-2.3.0.0-r1.ebuild b/app-admin/ansible/ansible-2.3.0.0-r1.ebuild
deleted file mode 100644
index e813dc57098a..000000000000
--- a/app-admin/ansible/ansible-2.3.0.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	<dev-python/jinja-2.9[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		<dev-python/mock-1.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/CVE-2017-7481.patch" )
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-}
diff --git a/app-admin/ansible/ansible-2.3.0.0-r2.ebuild b/app-admin/ansible/ansible-2.3.0.0-r2.ebuild
deleted file mode 100644
index 000bb855c149..000000000000
--- a/app-admin/ansible/ansible-2.3.0.0-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz
-	 mirror://gentoo/${P}-pycryptodome.patch"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	<dev-python/jinja-2.9[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	)
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		<dev-python/mock-1.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/CVE-2017-7481.patch"
-	  "${DISTDIR}/${P}-pycryptodome.patch" )
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-}
diff --git a/app-admin/ansible/ansible-2.3.1.0.ebuild b/app-admin/ansible/ansible-2.3.1.0.ebuild
index a1704fce31a3..79f0274da907 100644
--- a/app-admin/ansible/ansible-2.3.1.0.ebuild
+++ b/app-admin/ansible/ansible-2.3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 8262b51ce2aa..8a369d01a833 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,3 +1,2 @@
-DIST eselect-1.4.5.tar.xz 175992 SHA256 15beabb4c2afab4f833ceb2a66859849a5c20b8f8d61366ffe4b556a200d5f12 SHA512 d561b66386ac90335041e8fb88dd85cbe98ea32a98eab309a5fb07de1b9fe10c50dcdd03f93632d4bc938c1729ddb0954fa37482eb7856a87c24f41a7bc29a35 WHIRLPOOL e18839e9ff0ea1af03c6246533e72d39f9f7eb61f28d6cec3ff1a571374f23f7d55751c1f20bfb99c40fb44a81b5754b6c92d62c98f6b1b45dc8bf388b54db40
 DIST eselect-1.4.8.tar.xz 176692 SHA256 68f0de3e47895859dcbfcaab71175714f366891c8d2da4561121f48f2fff71eb SHA512 13faa3b21d352975498eb2ea62dfb8d371f30afd6e283c30ff4e89cef035598a8cfe8fafbc6763f39081c547f6743c7f4731d21170625781b89d64eb46c22194 WHIRLPOOL 3c026bb5e743263ea67a41e4f151775c6e5007617f902ebe734ba5c7c837ac9fd6f74c67ffce5e3f192861190da986d38016df4ad9e8e6ce4fe7e66235d95806
 DIST eselect-1.4.9.tar.xz 176776 SHA256 50f7a8f319f7615d07c2f395414af5a39dbc2db8602869714c14609a663a1216 SHA512 88e9d81086596849ef6daf87da3f782886286b1b829d0d6378c3c3c7d9f044a2eb2dc4e1596c2f49eb2ee4e443eebaab3be4bdb223a36bb5f7b66ac0686e2640 WHIRLPOOL ec7f9242f67876a7e228504e28607745dbacae57e659b8cfba857a55f998de2ad571bd1f45e69a99b6510922a7a51f2793b6be27e03632d32adda4d20d84de92
diff --git a/app-admin/eselect/eselect-1.4.5.ebuild b/app-admin/eselect/eselect-1.4.5.ebuild
deleted file mode 100644
index 2f22ced24bec..000000000000
--- a/app-admin/eselect/eselect-1.4.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
-SLOT="0"
-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"
-IUSE="doc emacs vim-syntax"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses"
-
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}
diff --git a/app-admin/eselect/eselect-1.4.8.ebuild b/app-admin/eselect/eselect-1.4.8.ebuild
index 155d039ff993..f6c61c068cae 100644
--- a/app-admin/eselect/eselect-1.4.8.ebuild
+++ b/app-admin/eselect/eselect-1.4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
index 154834f99a8e..0dea33e32b53 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
index c632dabd9e21..b2b9506f69bb 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirro
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc sparc x86"
 IUSE="network-cron nls selinux"
 
 DEPEND=""
diff --git a/app-admin/logrotate/logrotate-3.12.2.ebuild b/app-admin/logrotate/logrotate-3.12.2.ebuild
index b73823ba8520..a6e6711534bb 100644
--- a/app-admin/logrotate/logrotate-3.12.2.ebuild
+++ b/app-admin/logrotate/logrotate-3.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 37d6392a0ebf..69ffbf4712c2 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1 +1,2 @@
 DIST mcelog-149.tar.gz 296943 SHA256 a9313ed45cabaf7ef0a4d986ecf24a3c9ced9a4b1e34032d380af4e70c73512f SHA512 d2cb7cb26d4407dd03a425568a19c96e5f53cc9447c58cd105d74a2f69b645ef6b444c9533186aac6b052f0721959a321a3f8061477d1451a62be36add097aeb WHIRLPOOL ddea0a8efca6e5180d4d3ce663a0366b1a2eb78d8d11690e21aea81d3956838013aec7e83f29f6a745a63d18e95e8c71a2b00be135a5982013462b3911aa7f57
+DIST mcelog-152.tar.gz 297083 SHA256 7a903710a8ae0a031d337cc1e9e01f5353467e7f9aecea44bd50659793163022 SHA512 e89a4d81c87211f345d2f90dfb36bbb6ef4474745ac878285801b6ab4edd1ebc32feaf38b60f5976e7b9f29700495c2325f0e05c8ec432a22d77c1e9207a5e1a WHIRLPOOL 38e9526e2a16e4f25d0c4b218884c871b84cf0c2416ed80069746d0af3b7c2eff9d17b6f350b04f53564a172fb61b61ff8b51038ca639c37dbfbc7e6d3b34cec
diff --git a/app-admin/mcelog/mcelog-152.ebuild b/app-admin/mcelog/mcelog-152.ebuild
new file mode 100644
index 000000000000..4ac0a016c0dd
--- /dev/null
+++ b/app-admin/mcelog/mcelog-152.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+CONFIG_CHECK="~X86_MCE"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
index 6ce26c6d770f..f41cfb584790 100644
--- a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
+++ b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index 4179fc9b49ee..b70939226e6d 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild b/app-arch/libarchive/libarchive-3.3.1.ebuild
index 02dbd235593b..132a0e75838b 100644
--- a/app-arch/libarchive/libarchive-3.3.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
 
 RDEPEND="
diff --git a/app-arch/xar/xar-1.6.1-r1.ebuild b/app-arch/xar/xar-1.6.1-r1.ebuild
index 984823ca1b2b..32aa93942275 100644
--- a/app-arch/xar/xar-1.6.1-r1.ebuild
+++ b/app-arch/xar/xar-1.6.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://github/mackyle/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+bzip2 libressl"
 
 DEPEND="
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index c1ccc6bb3563..8f28f5f72ece 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -6,3 +6,4 @@ DIST amanda-3.4.1.tar.gz 5338575 SHA256 1f69e9bdae774ac2394297dd9d7f98ccbce44ca9
 DIST amanda-3.4.2.tar.gz 5353734 SHA256 175c6a2ef57fe480ddeeefc920a93c8d1cde4111eec76d76e088101a53eeafac SHA512 dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd WHIRLPOOL af08e2b7b42cead569b69edfa264c1439d21d455e36ba5d346a74631e037773f20cd0563c6cdf95eeea0ee0e1e45328e553a5490ef4c66545acc1a3bd85570d0
 DIST amanda-3.4.3.tar.gz 5355137 SHA256 8ebca59d7b5fc64179fee3d9de4289cd9e8dbb49558e0a21228b06e16105d688 SHA512 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a WHIRLPOOL e1c4cd778d5c71994d2c74fef07948476f367fff42e666fb1b516035746c1e9562b9bf4579875e922c44f8dd65924bf9fec5ca7d30bbee0998540c4c319d18b0
 DIST amanda-3.4.4.tar.gz 5363929 SHA256 467e44eccd47170cf8ec40e914a2fbc1e6d50966e6a71c46d96091183c54a3d3 SHA512 e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96 WHIRLPOOL 221848cd608fd3e45b4f172f56ab691dc2a1dd659f3a5f15df6a2e973daae0964d88fd359c9975147b358289feb77779342f26956b0e693f8683da8d621f04ea
+DIST amanda-3.4.5.tar.gz 5365381 SHA256 bf05ea512676c7520ccff8d711e17176ea2aec47f7c517669cee02e8ab201343 SHA512 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c WHIRLPOOL c21b1cbf276d60fae48c9178b7ae56416c81af4729341e9251b95c50775a3fdaf147c8d1d0e7c33b9477cd215ea4c0c51ac22e16348d2dfd9af20587d53f4b32
diff --git a/app-backup/amanda/amanda-3.4.5.ebuild b/app-backup/amanda/amanda-3.4.5.ebuild
new file mode 100644
index 000000000000..9e26503c1a4a
--- /dev/null
+++ b/app-backup/amanda/amanda-3.4.5.ebuild
@@ -0,0 +1,479 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
+	[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
+	[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
+	[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
+	[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
+	[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
+	[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
+	[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
+	[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
+	[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
+	[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
+	[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
+
+	# What tar to use
+	[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
+		chmod u=srwx,g=rx,o= "${root}"/${i}
+	done
+}
diff --git a/app-cdr/burn-cd/burn-cd-1.8.1.ebuild b/app-cdr/burn-cd/burn-cd-1.8.1.ebuild
index 94d13a444d13..1d58277de432 100644
--- a/app-cdr/burn-cd/burn-cd-1.8.1.ebuild
+++ b/app-cdr/burn-cd/burn-cd-1.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aglyzov/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
index 48951271a9ed..51f5b5757aa5 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/cdrtools"
diff --git a/app-crypt/gnupg/gnupg-2.1.20-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.20-r1.ebuild
index 6428ce942416..5ce9f46cd62e 100644
--- a/app-crypt/gnupg/gnupg-2.1.20-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.20-r1.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
 
 MY_P="${P/_/-}"
 SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT="0"
 IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server"
diff --git a/app-doc/pms/pms-6_p20170429.ebuild b/app-doc/pms/pms-6_p20170429.ebuild
index 1c9f35a6356f..2d6d3ccc1d8b 100644
--- a/app-doc/pms/pms-6_p20170429.ebuild
+++ b/app-doc/pms/pms-6_p20170429.ebuild
@@ -10,7 +10,7 @@ SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz )
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-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"
+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"
 IUSE="binary html"
 
 # texlive-bibtexextra: plainurl.bst
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 22781f51be00..69481c41f971 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,7 +1,6 @@
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
 DIST emacs-18.59-patches-9.tar.xz 21380 SHA256 69411c57b20850e8aab1e20614437f9a836c2ddf47c46a833d0262c138fa3270 SHA512 595a4a7a4052c3b3325e4d4952eed24c98d3dd62b7ce89bd149f046552e2dd67ec3e720b7559fbc086b06a667c992bccc60201ef53b263dbd0fc96cbcdceee38 WHIRLPOOL 23f803d940c35fe9519fe7169e6bca7012c2d2db2246dec121fba37e8dbf39f411a9e579a9cbd4193562da72b9ac226286ad687877ccadd7cb78ea7eb615ab3f
 DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
-DIST emacs-23.4-patches-19.tar.xz 17684 SHA256 078f5e103af9b9950afefcb8575eefd7b07eb0a241ab67ddb3b8b6d31f657abb SHA512 118d58cd5c8a74b39642bf45920fed25687af2e4a076affe985bf359862950eeba4f2ca99c6482c17c311466fbfaab3f4d583466821da4917fae9bec6e95940a WHIRLPOOL f6fe96f5cb0c2de2a48e6eda2cd26c9c724cd2da661ef4d3e4e4dd14382299615aac4b95bd4e7a21caae74b7630a70d160d65e89f6ac5fa91ad8d9bedaddded4
 DIST emacs-23.4-patches-20.tar.xz 18544 SHA256 3ea6d9211b03ee5566674bf1ae3d4032c0921234c1612af66407e880f7e52749 SHA512 cf98090327a1963625b91149d8ff66e9ec4dc8c0bb1054eee138429b5c0d39c2a4662ae5425d7f06e7e69a17d28353f163ca38f6fe786d10def8e143f8a6b1d6 WHIRLPOOL ac3283271d71dc43595fc95dd8930e5888ef7d22cbd19c4701206ebc5aaac8178f462b789a058bb3ae6c9a17c63c0f2a16185708c4517566de50fc035298fe31
 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
 DIST emacs-24.5-patches-3.tar.xz 12500 SHA256 4927e037141c0c242d0d6d3aa7dfde140faae361aa556e6ded64b7ab26819f07 SHA512 9bddca3d4a67b57ca03c26fbca378def345592a95c40e868fc47fd9944ed0f750bc30f3a4d588a8a0b4c90daa6c9ed63b56182e8d2d87b4c8d849bf834ead1cc WHIRLPOOL c16cbfda1040b205ced4c1ed120aad6f65285fb315ce89dc936e6a357fbc8f9215fb178b696d2a914c53c6869384f0b1b56fcb6b84c5438f026101b4989de6c5
diff --git a/app-editors/emacs/emacs-23.4-r14.ebuild b/app-editors/emacs/emacs-23.4-r14.ebuild
deleted file mode 100644
index 6deb0be4d013..000000000000
--- a/app-editors/emacs/emacs-23.4-r14.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-19.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="23"
-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"
-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"
-REQUIRED_USE="?? ( aqua X )"
-
-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 ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -fstrict-aliasing -pie
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf+=" --with-sound"
-	else
-		myconf+=" $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=gtk"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser=":gamestat" \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake CC="$(tc-getCC)" \
-		AR="$(tc-getAR) cq" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-
-	# move man pages to the correct place
-	local m
-	mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
-		|| die "moving emacs man page failed"
-	for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
-		mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
-			|| die "moving ${m} man page failed"
-	done
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-23.4-r15.ebuild b/app-editors/emacs/emacs-23.4-r15.ebuild
index 9b4362e59e99..34eef1e0b9d6 100644
--- a/app-editors/emacs/emacs-23.4-r15.ebuild
+++ b/app-editors/emacs/emacs-23.4-r15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-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"
+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"
 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"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-25.2.ebuild b/app-editors/emacs/emacs-25.2.ebuild
index bcdc0b35edf2..e1b0b5630a22 100644
--- a/app-editors/emacs/emacs-25.2.ebuild
+++ b/app-editors/emacs/emacs-25.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-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"
+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"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading 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"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/xvile/xvile-9.8r.ebuild b/app-editors/xvile/xvile-9.8r.ebuild
index be83af8000c0..a402411fc170 100644
--- a/app-editors/xvile/xvile-9.8r.ebuild
+++ b/app-editors/xvile/xvile-9.8r.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://invisible-island.net/vile/current/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="perl"
 
 RDEPEND="perl? ( dev-lang/perl )
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 3f9d2d67772e..7254540e1156 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,2 +1 @@
-DIST emacs-common-gentoo-1.5.tar.xz 40844 SHA256 fbec52de8552c6b22f56382a28d469d9346c02c7569c05cdb0db6a54b39995a1 SHA512 61ac2a1bb8bc449480137789f4d93228d81d2a7ea87a255a7fd82072ce98eecf5f585d102db95f0deda06102e27efbd5d9fce8cd21d6b58239f7a2b6d4ee4d55 WHIRLPOOL bb6d58d8afb55c9d6204f82553962190cd50f64d25ea5fb50308827f88ea3b1c42dc0e072155567391ffc7745b8871c733c9aee5042b57bfcbef5e5419d0b6cf
 DIST emacs-common-gentoo-1.6.tar.xz 61224 SHA256 7f43a198068abba9e0735f7dee3bb642dd1531e33563ded364751319bea8f9ec SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a WHIRLPOOL 7112026dda683d6282807181e7a6e1d666c90df0858b63ae704db05b40ff59b10ab984dd066eeb91fc670cff71eb9bc94cac7b19571409ac166d53a6cec16e39
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild
deleted file mode 100644
index dab2cf5aa306..000000000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp-common eutils fdo-mime gnome2-utils readme.gentoo user
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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 ~sparc-solaris ~x86-solaris"
-IUSE="games X"
-
-PDEPEND="virtual/emacs"
-
-pkg_setup() {
-	use games && enewgroup gamestat 36
-}
-
-src_install() {
-	insinto "${SITELISP}"
-	doins subdirs.el
-	newins site-gentoo.el{,.orig}
-
-	keepdir /etc/emacs
-	insinto /etc/emacs
-	doins site-start.el
-
-	if use games; then
-		keepdir /var/games/emacs
-		fowners 0:gamestat /var/games/emacs
-		fperms g+w /var/games/emacs
-	fi
-
-	if use X; then
-		local i
-		domenu emacs.desktop emacsclient.desktop || die
-
-		pushd icons || die
-		newicon sink.png emacs-sink.png
-		newicon emacs_48.png emacs.png
-		newicon emacs22_48.png emacs22.png
-		for i in 16 24 32 48 128; do
-			newicon -s ${i} emacs_${i}.png emacs.png
-		done
-		for i in 16 24 32 48; do
-			newicon -s ${i} emacs22_${i}.png emacs22.png
-		done
-		doicon -s scalable emacs.svg
-		popd
-
-		gnome2_icon_savelist
-	fi
-
-	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
-		added to ${SITELISP}/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site startup file /etc/emacs/site-start.el is installed. You are
-		responsible for maintenance of this file.
-		\n\nAlternatively, individual users can add the following command:
-		\n\n(require 'site-gentoo)
-		\n\nto their ~/.emacs initialisation files, or, for greater
-		flexibility, users may load single package-specific initialisation
-		files from the ${SITELISP}/site-gentoo.d/ directory."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
-		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	fi
-	if [[ -d ${EROOT}${SITELISP} ]]; then
-		elisp-site-regen
-		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
-	fi
-
-	if use games; then
-		local f
-		for f in /var/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			fi
-			touch "${ED}${f}" || die
-			chgrp gamestat "${ED}${f}" || die
-			chmod g+w "${ED}${f}" || die
-		done
-
-		if has 1.4-r1 ${REPLACING_VERSIONS} \
-				&& [[ -d ${EROOT}/var/games/emacs ]]; then
-			elog "Updating owner and permissions of score file directory."
-			chown 0:gamestat "${EROOT}"/var/games/emacs || die
-			chmod 775 "${EROOT}"/var/games/emacs || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild
index 77da735814cd..f3474d6cb875 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-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 ~sparc-solaris ~x86-solaris"
+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 ~sparc-solaris ~x86-solaris"
 IUSE="games X"
 
 PDEPEND="virtual/emacs"
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.1.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.1.ebuild
index 59464198a711..4dd784c1939c 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.1.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-misc/bb/bb-1.3.0_rc1-r4.ebuild b/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
index 0b661bcdbea7..51619fefdd36 100644
--- a/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
+++ b/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="mikmod"
 
 DEPEND="media-libs/aalib:=
diff --git a/app-misc/tmux/tmux-2.3-r1.ebuild b/app-misc/tmux/tmux-2.3-r1.ebuild
index 8f4589f16707..363177710215 100644
--- a/app-misc/tmux/tmux-2.3-r1.ebuild
+++ b/app-misc/tmux/tmux-2.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-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"
+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"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3.ebuild
index 8b66b83857f2..844a72f7b20b 100644
--- a/app-office/dia/dia-0.97.3.ebuild
+++ b/app-office/dia/dia-0.97.3.ebuild
@@ -57,7 +57,6 @@ src_prepare() {
 
 	if use python; then
 		python_fix_shebang .
-		sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die #298232
 	fi
 
 	if ! use doc; then
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 5ae668774222..14af1bf5df8a 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,2 +1 @@
-DIST kexi-3.0.0.tar.xz 3678724 SHA256 8acfdf9f933139544aa8a8f53b04f5266c1cec6b3844963d04404e8b7f72ffe0 SHA512 c42b50aaa0878171c0a238226b47774a3370f6ca4411c344a7d31e78ee3cb5b930be4a493290a887dc239146d49c7d7da71028587aabbf8e5497704dab7bf826 WHIRLPOOL 0c4ae66e3985cd36d4687ca0ffcfeac6a19aa838a765cc0211efe4d11fc7be661c1beb8792b83f8f54cabbc274e7d8859dbcb2a294c173712e2df3271806aa95
 DIST kexi-3.0.1.tar.xz 1967476 SHA256 23e564a8ddd3b48ddeddb9d9104820a9548fd77a116b3bb4873e5c120e4ac25c SHA512 de8c84416d10234c9cdfa57d4468023636e8a5253e2c0da93dd92b935930ef97ad173796eb0abde9ef6a027efc83618d8617eeb84062f34e52008882386628b6 WHIRLPOOL a6d400040bcc43cc504f0ff9dd4e7bcbe56b159cfdfcfca064d90a4d7aeb7844a78f15196b82cfa9eba5453034df09e7f9f72f5685de092cf9f62ecc4ad6f36c
diff --git a/app-office/kexi/kexi-3.0.0.ebuild b/app-office/kexi/kexi-3.0.0.ebuild
deleted file mode 100644
index f19f54f3cf4c..000000000000
--- a/app-office/kexi/kexi-3.0.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# KDE_HANDBOOK="true"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Visual database applications creator"
-HOMEPAGE="https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="marble mdb mysql postgres sqlite webkit"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-db/kdb[mysql?,postgres?,sqlite?]
-	dev-libs/kproperty
-	dev-libs/kreport
-	marble? ( $(add_kdeapps_dep marble) )
-	mdb? ( dev-libs/glib:2 )
-	mysql? ( virtual/libmysqlclient )
-	postgres? (
-		dev-db/postgresql:*
-		dev-libs/libpqxx
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep breeze-icons-rcc)
-	!app-office/calligra:4[calligra_features_kexi]
-	!app-office/calligra-l10n:4[calligra_features_kexi(+)]
-"
-
-src_prepare() {
-	if ! use webkit; then
-		punt_bogus_dep Qt5 WebKit
-		punt_bogus_dep Qt5 WebKitWidgets
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package marble KexiMarble)
-		$(cmake-utils_use_find_package mdb GLIB2)
-		$(cmake-utils_use_find_package mysql MySQL)
-		$(cmake-utils_use_find_package postgres KexiPostgreSQL)
-	)
-	kde5_src_configure
-}
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index 6db696681956..03694691d4a7 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -86,7 +86,7 @@ fi
 
 if ${use_color} ; then
 	if [[ ${EUID} == 0 ]] ; then
-		PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
+		PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \w \$\[\033[00m\] '
 	else
 		PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
 	fi
@@ -99,7 +99,7 @@ if ${use_color} ; then
 else
 	if [[ ${EUID} == 0 ]] ; then
 		# show root@ when we don't have colors
-		PS1+='\u@\h \W \$ '
+		PS1+='\u@\h \w \$ '
 	else
 		PS1+='\u@\h \w \$ '
 	fi
diff --git a/app-text/an/an-1.2-r1.ebuild b/app-text/an/an-1.2-r1.ebuild
new file mode 100644
index 000000000000..d9c01423a53c
--- /dev/null
+++ b/app-text/an/an-1.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Very fast anagram generator with dictionary lookup"
+HOMEPAGE="http://packages.debian.org/unstable/games/an"
+
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/icu:=
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/miscfiles[-minimal]
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CC/s|:=|?=|' \
+		-e 's|$(CC) $(CFLAGS)|& $(LDFLAGS)|g' \
+		-e '/^CPPFLAGS/s|-D_BSD_SOURCE=1 -D_GNU_SOURCE=1|-D_DEFAULT_SOURCE=1|g' \
+		Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	newman ${PN}.6 ${PN}.1
+	dodoc ALGORITHM
+}
diff --git a/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild b/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
index a8400f632ba4..6f5fbf91d740 100644
--- a/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
+++ b/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
@@ -28,7 +28,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 9196b1f72cd9..1f7c1f544a6e 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,2 +1,4 @@
 DIST ghostscript-9.20.tar.xz 26387028 SHA256 3c0f3dc5df6f784850fa4ce7dcc3d6c56ef543af1fbaedd1d9f8d9f8b66de0ab SHA512 3e636f9746303f0d0fbcdfed22e8da4cc2cfd87c2afde38ffef67acb6a9fc2416aaca691d64355294e70f699bcf4acf33b09d3493dc24bc3c368387f066357fd WHIRLPOOL 0c58d8a860093ae856339839aa5012f5e47d87891fc16890cf7730979cb6506c1b686a6c1ca5dfbdcaafc614d989fec09b665d9eacc784f0dc31bca50d341f7f
+DIST ghostscript-9.21.tar.xz 29164532 SHA256 2be1d014888a34187ad4bbec19ab5692cc943bd1cb14886065aeb43a3393d053 SHA512 cfea089b92fb01e3f7c18a9ce05e7165fc8b356e2914bf53b7f2fd9de672279c8b97ced07e983e619f0d4334ce16018b100cfbf0cc872c215a8cf2aff4c78731 WHIRLPOOL 3836454ff852633940420a4812667b13c7e9b6602c3fcac7383298bf06cf2157a4580ad4c06cb9797af21418b162f52ff5bc03dd3651079078677eba252c8b40
 DIST ghostscript-gpl-9.20-patchset-2.tar.xz 16696 SHA256 10172b0e1c2bf85933d568bb59f3aa7c1faf7b56b8cf3ab54dfa41e032c3490d SHA512 c62acfaae388d9ecd0d00b3b63e1e42fdc917eaf568ac65833490656d6f7261a7b8df3ba44ed50373007f48b4dd3ca9a3c528ae126307d58635200521e32ba4d WHIRLPOOL 3bf59a324f8f35764cad687da158c404f884ed639505ee5a3ca79ef90bba36b8f4e6919a40aae99947b75697d743340aa88b6a5ba1d7c0e12d17b124385347d3
+DIST ghostscript-gpl-9.21-patchset-1.tar.xz 6196 SHA256 53abca720b67cd6b6117b2d4e2946916957fac68ce5caffe7c151504f9db777c SHA512 58fef7080ca17a238231fb528be48f52bcfa771b1e496d7fede6df45fb927f1bb1c755cb77e02aa739295b0ccf0b3d3959f9a05a1628d32ffd11e134c0e0d355 WHIRLPOOL 2541f34acaa5fc923cd82b8873c82acc512bca2b6b28cf347e511acd5a259b4676687cc3c2454b8631a4c7559801c3691e6397c8bf3e04c7575c9566574f35c9
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
new file mode 100644
index 000000000000..73c275b391f5
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib versionator flag-o-matic toolchain-funcs
+
+DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
+HOMEPAGE="http://ghostscript.com/"
+
+MY_P=${P/-gpl}
+PVM=$(get_version_component_range 1-2)
+PVM_S=$(replace_all_version_separators "" ${PVM})
+
+MY_PATCHSET=1
+
+SRC_URI="
+	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz
+"
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
+
+COMMON_DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	media-libs/jbig2dec
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=sys-libs/zlib-1.2.7:=
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	unicode? ( net-dns/libidn )
+	tiff? ( >=media-libs/tiff-4.0.1:0= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/poppler-data-0.4.5-r1
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )
+	!!media-fonts/gnu-gs-fonts-std
+	!!media-fonts/gnu-gs-fonts-other
+	!<net-print/cups-filters-1.0.36-r2
+"
+
+S="${WORKDIR}/${MY_P}"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+src_prepare() {
+	default
+
+	# remove internal copies of various libraries
+	rm -rf "${S}"/cups/libs || die
+	rm -rf "${S}"/expat || die
+	rm -rf "${S}"/freetype || die
+	rm -rf "${S}"/jbig2dec || die
+	rm -rf "${S}"/jpeg{,xr} || die
+	rm -rf "${S}"/lcms{,2} || die
+	rm -rf "${S}"/libpng || die
+	rm -rf "${S}"/tiff || die
+	rm -rf "${S}"/zlib || die
+	rm -rf "${S}"/openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -rf "${S}"/Resource/CMap || die
+
+	# apply various patches, many borrowed from Fedora
+	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
+	eapply "${WORKDIR}/patches/"*.patch
+
+	if ! use gtk ; then
+		sed -i -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			"${S}"/base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -i \
+		-e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -i \
+		-e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -i -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
+
+	cd "${S}" || die
+	# remove incorrect symlink, bug 590384
+	rm -f ijs/ltmain.sh || die
+	eautoreconf
+
+	cd "${S}/ijs" || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with tiff system-libtiff) \
+		$(use_with X x)
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd "${S}/ijs" || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# rename the original cidfmap to cidfmap.GS
+	mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
+
+	# install our own cidfmap to handle CJK fonts
+	insinto /usr/share/ghostscript/${PVM}/Resource/Init
+	doins \
+		"${WORKDIR}/fontmaps/CIDFnmap" \
+		"${WORKDIR}/fontmaps/cidfmap"
+	for X in ${LANGS} ; do
+		if use l10n_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
+		fi
+	done
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym "${EPREFIX}/usr/share/poppler/cMaps" "/usr/share/ghostscript/${PVM}/Resource/CMap"
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/hunspell/hunspell-1.6.1-r1.ebuild b/app-text/hunspell/hunspell-1.6.1-r1.ebuild
index 931bb5f1c2f5..fa1d1ac218a2 100644
--- a/app-text/hunspell/hunspell-1.6.1-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.6.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://hunspell.sourceforge.net/"
 SLOT="0/$(get_version_component_range 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-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 ~x64-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 ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild b/app-text/mupdf/mupdf-1.11-r1.ebuild
index 52e586357be1..bc98cb12bac8 100644
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mupdf.com/downloads/${P}-source.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla"
 
 LIB_DEPEND="
diff --git a/app-text/openjade/openjade-1.3.2-r7.ebuild b/app-text/openjade/openjade-1.3.2-r7.ebuild
index b79cbee99959..76a69194cc9f 100644
--- a/app-text/openjade/openjade-1.3.2-r7.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="app-text/sgml-common
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
index 19e3ab004b9d..a935ce388944 100644
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ b/app-text/po4a/po4a-0.47-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-perl/SGMLSpm
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
index c865e1c8be47..7df55f2e2b5a 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/texlive-core/texlive-core-2016-r5.ebuild b/app-text/texlive-core/texlive-core-2016-r5.ebuild
index bdebdc543702..42c96bf09b63 100644
--- a/app-text/texlive-core/texlive-core-2016-r5.ebuild
+++ b/app-text/texlive-core/texlive-core-2016-r5.ebuild
@@ -74,7 +74,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive-core/texlive-core-2017-r1.ebuild b/app-text/texlive-core/texlive-core-2017-r1.ebuild
index 27a95472218e..76834397526a 100644
--- a/app-text/texlive-core/texlive-core-2017-r1.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r1.ebuild
@@ -115,8 +115,8 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 		media-gfx/graphite2
 	)
 	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.1
-	cjk? ( >=dev-libs/ptexenc-1.3.4_p20160523 )"
+	>=dev-libs/kpathsea-6.2.3
+	cjk? ( >=dev-libs/ptexenc-1.3.5 )"
 
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -125,9 +125,9 @@ DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils"
 
 RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.8_p20160523
-	>=app-text/dvipsk-5.996_p20160523
-	>=dev-tex/bibtexu-3.71_p20160523
+	>=app-text/ps2pkm-1.8_p20170524
+	>=app-text/dvipsk-5.997
+	>=dev-tex/bibtexu-3.71_p20170524
 	virtual/perl-Getopt-Long
 	tk? ( dev-perl/Tk )"
 
diff --git a/app-text/texlive/texlive-2016.ebuild b/app-text/texlive/texlive-2016.ebuild
index a3f68b5d347d..9cc14a6bdae2 100644
--- a/app-text/texlive/texlive-2016.ebuild
+++ b/app-text/texlive/texlive-2016.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
index 2f9a816370bc..ad26e746b588 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
index d34a1dd9d2a9..9f45400c723d 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 IUSE="debug doc static-libs"
 
diff --git a/dev-cpp/gtest/gtest-1.7.0-r1.ebuild b/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
index 3f28a6607d88..8b04d25806f1 100644
--- a/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://googletest.googlecode.com/files/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-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"
+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"
 IUSE="examples static-libs"
 
 DEPEND="app-arch/unzip
diff --git a/dev-db/freetds/freetds-1.00.41.ebuild b/dev-db/freetds/freetds-1.00.41.ebuild
index 7af50aaeea36..d06e7b6de489 100644
--- a/dev-db/freetds/freetds-1.00.41.ebuild
+++ b/dev-db/freetds/freetds-1.00.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.freetds.org/pub/freetds/stable/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 IUSE="gnutls iconv kerberos libressl mssql iodbc odbc ssl"
 RESTRICT="test"
 
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 42f54f28a417..86f8f8e52f31 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1,2 @@
 DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256 0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f WHIRLPOOL 928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499
+DIST mysql-connector-odbc-5.3.8-src.tar.gz 690403 SHA256 eca40e1ad359cd1d7e23b6692e60179c8e3daa66337e7a0232de4162664d9885 SHA512 4703deab548f2953a58421b20977ced8dfd197d5274f89dd9e080cebdf35da007e558d5d52b6b09109744eddc2905c834f1e3e2ac83df4249d069d5e14fd34ee WHIRLPOOL 9286058a7d57e13e9a2e683682d87e0226e0e451880a20579867b673144d69f7941fbe16706267ca2caa058b1aef15fb4516445af8ab164fb745cd81a0c2814f
diff --git a/dev-db/myodbc/files/5.3-cmake-doc-path.patch b/dev-db/myodbc/files/5.3-cmake-doc-path.patch
new file mode 100644
index 000000000000..54f35d41d96a
--- /dev/null
+++ b/dev-db/myodbc/files/5.3-cmake-doc-path.patch
@@ -0,0 +1,43 @@
+=== modified file 'CMakeLists.txt'
+--- a/CMakeLists.txt	2013-03-09 09:51:06 +0000
++++ b/CMakeLists.txt	2013-03-09 11:05:27 +0000
+@@ -33,6 +33,12 @@
+ 
+ INCLUDE(version.cmake)
+ 
++IF(WITH_DOCUMENTATION_INSTALL_PATH)
++	set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
++ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
++	set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
++ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
++
+ #Default is to build both drivers
+ IF(UNICODE OR NOT ANSI)
+ 	MESSAGE(STATUS "Configuring to build Unicode driver")
+@@ -329,19 +335,17 @@
+ 
+ ELSE(WIN32)
+ 
+-  INSTALL(FILES ChangeLog    DESTINATION .)
+-  INSTALL(FILES README       DESTINATION .)
+-  INSTALL(FILES README.debug DESTINATION .)
+-  INSTALL(FILES INSTALL      DESTINATION .)
++    INSTALL(FILES ChangeLog    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++    INSTALL(FILES README       DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++    INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++    INSTALL(FILES INSTALL      DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+   IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+-    INSTALL(FILES COPYING       DESTINATION .)
+   ELSE()
+-    INSTALL(FILES LICENSE.mysql DESTINATION .)
+   ENDIF()
+ 
+ ENDIF(WIN32)
+ 
+-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
++INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ 
+ INCLUDE(CPack)
+ 
+
+
diff --git a/dev-db/myodbc/files/5.3-cxxlinkage.patch b/dev-db/myodbc/files/5.3-cxxlinkage.patch
new file mode 100644
index 000000000000..319262c81ca3
--- /dev/null
+++ b/dev-db/myodbc/files/5.3-cxxlinkage.patch
@@ -0,0 +1,43 @@
+diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
+--- a/cmake/FindMySQL.cmake	2016-11-29 07:40:13.000000000 -0500
++++ b/cmake/FindMySQL.cmake	2017-02-17 13:59:18.115389096 -0500
+@@ -747,7 +747,7 @@
+     endif()
+ 
+     if(NOT MYSQL_CXXFLAGS)
+-      if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
++      if(MYSQL_CXX_LINKAGE)
+         _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+         set(MYSQL_CXX_LINKAGE 1)
+       else()
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-02-17 13:50:43.556006202 -0500
++++ b/CMakeLists.txt	2017-02-17 13:57:15.745676184 -0500
+@@ -242,10 +242,9 @@
+ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
+ SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
+ 
+-SET(LIB_SUBDIR "lib")
+-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") 
+-  SET(LIB_SUBDIR "lib64")
+-ENDIF()
++IF(NOT LIB_SUBDIR)
++	MESSAGE(ERROR "LIB_SUBDIR is not set")
++ENDIF(NOT LIB_SUBDIR)
+ 
+ MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
+ 
+diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
+--- a/cmake/FindMySQL.cmake	2017-02-17 14:44:29.532733308 -0500
++++ b/cmake/FindMySQL.cmake	2017-02-17 14:48:56.756740330 -0500
+@@ -270,8 +270,8 @@
+   set(_static_lib_ext ".lib")   # Careful, can be import library for DLL
+ elseif(MYSQLCLIENT_NO_THREADS)
+   # In 5.1 and below there is a single threaded library
+-  set(_dynamic_libs   "mysqlclient")
+-  set(_static_libs    "libmysqlclient.a")
++  set(_dynamic_libs   "${MYSQLCLIENT_LIB_NAME}")
++  set(_static_libs    "lib${MYSQLCLIENT_LIB_NAME}.a")
+   set(_static_lib_ext ".a")
+ else()
+   # We try the multithreaded "libmysqlclient_r" first and if not
diff --git a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch b/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch
new file mode 100644
index 000000000000..1be9cc466b65
--- /dev/null
+++ b/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch
@@ -0,0 +1,93 @@
+diff -aurN a/driver/connect.c b/driver/connect.c
+--- a/driver/connect.c	2016-11-29 07:40:13.000000000 -0500
++++ b/driver/connect.c	2017-02-17 16:14:48.116640371 -0500
+@@ -510,11 +510,11 @@
+     }
+   }
+ 
+-#if MYSQL_VERSION_ID >= 50709
+-  mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length);
++#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
++  mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length_value);
+ #else
+   // for older versions just use net_buffer_length() macro
+-  dbc->net_buffer_length = net_buffer_length;
++  dbc->net_buffer_length_value = net_buffer_length;
+ #endif
+   return rc;
+ 
+diff -aurN a/driver/cursor.c b/driver/cursor.c
+--- a/driver/cursor.c	2016-11-29 07:40:13.000000000 -0500
++++ b/driver/cursor.c	2017-02-17 16:13:19.163299885 -0500
+@@ -1485,7 +1485,7 @@
+               We have a limited capacity to shove data across the wire, but
+               we handle this by sending in multiple calls to exec_stmt_query()
+             */
+-            if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length)
++            if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length_value)
+             {
+                 break_insert= TRUE;
+                 break;
+diff -aurN a/driver/driver.h b/driver/driver.h
+--- a/driver/driver.h	2016-11-29 07:40:13.000000000 -0500
++++ b/driver/driver.h	2017-02-17 16:10:57.072950723 -0500
+@@ -378,7 +378,7 @@
+   int           txn_isolation;
+   uint          port;
+   uint          cursor_count;
+-  ulong         net_buffer_length;
++  ulong         net_buffer_length_value;
+   uint          commit_flag;
+ #ifdef THREAD
+   myodbc_mutex_t lock;
+diff -aurN a/driver/info.c b/driver/info.c
+--- a/driver/info.c	2016-11-29 07:40:13.000000000 -0500
++++ b/driver/info.c	2017-02-17 16:12:54.315763441 -0500
+@@ -587,7 +587,7 @@
+     MYINFO_SET_USHORT(0);
+ 
+   case SQL_MAX_STATEMENT_LEN:
+-    MYINFO_SET_ULONG(dbc->net_buffer_length);
++    MYINFO_SET_ULONG(dbc->net_buffer_length_value);
+ 
+   case SQL_MAX_TABLE_NAME_LEN:
+     MYINFO_SET_USHORT(NAME_LEN);
+diff -aurN a/driver/connect.c b/driver/connect.c
+--- a/driver/connect.c	2017-02-17 16:16:14.609026769 -0500
++++ b/driver/connect.c	2017-02-17 16:34:29.637592664 -0500
+@@ -179,7 +179,7 @@
+   /* Set other connection options */
+ 
+   if (ds->allow_big_results || ds->safe)
+-#if MYSQL_VERSION_ID >= 50709
++#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
+     mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, &max_long);
+ #else
+     /* max_allowed_packet is a magical mysql macro. */
+@@ -252,7 +252,7 @@
+                   ds_get_utf8attr(ds->rsakey, &ds->rsakey8));
+   }
+ 
+-#if MYSQL_VERSION_ID >= 50710
++#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION)
+   {
+     char tls_options[128] = { 0 };
+     if (!ds->no_tls_1)
+@@ -323,7 +323,7 @@
+ #endif
+ 
+   mysql->options.use_ssl = !ds->disable_ssl_default;
+-#if MYSQL_VERSION_ID >= 50703
++#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION)
+   {
+     if (ds->ssl_enforce)
+     {
+@@ -332,7 +332,7 @@
+   }
+ #endif
+ 
+-#if MYSQL_VERSION_ID >= 50711
++#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION)
+   if (ds->sslmode)
+   {
+     unsigned int mode = 0;
diff --git a/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch b/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch
new file mode 100644
index 000000000000..96720618a586
--- /dev/null
+++ b/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch
@@ -0,0 +1,96 @@
+diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c
+--- a/driver/catalog_no_i_s.c	2016-11-29 07:40:13.000000000 -0500
++++ b/driver/catalog_no_i_s.c	2017-02-17 14:07:03.979683613 -0500
+@@ -1093,7 +1093,11 @@
+   unsigned long *lengths;
+   SQLRETURN rc= SQL_SUCCESS;
+ 
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++  myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0));
++#else
+   myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
++#endif
+ 
+   /* Get the list of tables that match szCatalog and szTable */
+   myodbc_mutex_lock(&stmt->dbc->lock);
+diff -aurN a/driver/desc.c b/driver/desc.c
+--- a/driver/desc.c	2016-11-29 07:40:13.000000000 -0500
++++ b/driver/desc.c	2017-02-17 14:09:30.139954232 -0500
+@@ -63,13 +63,21 @@
+      but in desc_get_rec we manually get a pointer to it. This avoids
+      having to call set_dynamic after modifying the DESCREC.
+   */
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++  if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0)))
++#else
+   if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
++#endif
+   {
+     x_free((char *)desc);
+     return NULL;
+   }
+ 
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++  if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, MYF(0)))
++#else
+   if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0))
++#endif
+   {
+     delete_dynamic(&desc->records);
+     x_free((char *)desc);
+@@ -997,7 +1005,11 @@
+   delete_dynamic(&dest->records);
+   if (myodbc_init_dynamic_array(&dest->records, sizeof(DESCREC),
+                             src->records.max_element,
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++                            src->records.alloc_increment, MYF(0)))
++#else
+                             src->records.alloc_increment))
++#endif
+   {
+     return set_desc_error(dest, "HY001",
+               "Memory allocation error",
+diff -aurN a/driver/handle.c b/driver/handle.c
+--- a/driver/handle.c	2016-11-29 07:40:13.000000000 -0500
++++ b/driver/handle.c	2017-02-17 14:10:32.078797593 -0500
+@@ -409,7 +409,11 @@
+     }
+   }
+ 
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++  myodbc_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0));
++#else
+   myodbc_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
++#endif
+   memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
+ 											(*param_bind)->max_element);
+ 
+diff -aurN a/driver/parse.c b/driver/parse.c
+--- a/driver/parse.c	2016-11-29 07:40:13.000000000 -0500
++++ b/driver/parse.c	2017-02-17 14:12:00.638143846 -0500
+@@ -139,8 +139,13 @@
+ 
+     /* TODO: Store offsets rather than ptrs. In this case we will be fine
+        if work with copy of the originally parsed string */
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++    myodbc_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10, MYF(0));
++    myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0));
++#else
+     myodbc_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10);
+     myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
++#endif
+   }
+ 
+   return pq;
+diff -aurN a/MYODBC_MYSQL.h b/MYODBC_MYSQL.h
+--- a/MYODBC_MYSQL.h	2016-11-29 07:40:13.000000000 -0500
++++ b/MYODBC_MYSQL.h	2017-02-17 15:04:47.153994839 -0500
+@@ -44,7 +44,7 @@
+ #endif
+ 
+ #ifdef THREAD
+-#if MYSQL_VERSION_ID < 50703
++#if MYSQL_VERSION_ID < 50703 || defined(MARIADB_BASE_VERSION)
+ #include <my_pthread.h>
+ #define myodbc_mutex_t pthread_mutex_t
+ #define myodbc_key_t pthread_key_t
diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
index aea3236e0f01..22819c507ced 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -43,6 +43,9 @@ src_prepare() {
 	epatch "${FILESDIR}/cmake-doc-path.patch" \
 		"${FILESDIR}/${PVR}-cxxlinkage.patch" \
 		"${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
+
+	# Fix undefined references due to standards change
+	append-cflags -std=gnu89
 }
 
 multilib_src_configure() {
diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
index 24446560e0c3..e475faca21ee 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -46,6 +46,9 @@ src_prepare() {
 		"${FILESDIR}/${PV}-r1-cxxlinkage.patch" \
 		"${FILESDIR}/${PV}-mariadb-dynamic-array.patch" \
 		"${FILESDIR}/${PV}-my_malloc.patch"
+
+	# Fix undefined references due to standards change
+	append-cflags -std=gnu89
 }
 
 multilib_src_configure() {
diff --git a/dev-db/myodbc/myodbc-5.3.8.ebuild b/dev-db/myodbc/myodbc-5.3.8.ebuild
new file mode 100644
index 000000000000..228a5be73d57
--- /dev/null
+++ b/dev-db/myodbc/myodbc-5.3.8.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib flag-o-matic versionator
+
+MAJOR="$(get_version_component_range 1-2 $PV)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="http://www.mysql.com/products/myodbc/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Does not build with mysql-connector-c
+RDEPEND="
+	dev-db/unixODBC[${MULTILIB_USEDEP}]
+	~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+	)
+	!dev-db/mysql-connector-c
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+	"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+	"${FILESDIR}/${MAJOR}-cxxlinkage.patch"
+	"${FILESDIR}/${MAJOR}-mariadb-dynamic-array.patch"
+	"${FILESDIR}/5.2.7-my_malloc.patch"
+	"${FILESDIR}/${MAJOR}-mariadb-buffer_length.patch"
+)
+
+src_prepare() {
+	# Fix undefined references due to standards change
+	append-cflags -std=gnu89
+
+	# Remove Tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt"
+
+	# Fix as-needed on the installer binary
+	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
+	default
+}
+
+multilib_src_configure() {
+	local clientlib
+	for clientlib in "mariadb" "perconaclient" "mysqlclient" "notfound" ; do
+		[[ -x "${EPREFIX}/usr/$(get_libdir)/lib${clientlib}.so" ]] && break
+	done
+	[[ "${clientlib}x" == "notfoundx" ]] && \
+		die "Installed client library name could not be determined"
+
+	# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
+	# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
+	mycmakeargs+=(
+		-DMYSQL_CXX_LINKAGE=0
+		-DWITH_UNIXODBC=1
+		-DMYSQLCLIENT_LIB_NAME="${clientlib}"
+		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+		-DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+		-DMYSQL_INCLUDE_DIR="$(mysql_config --variable=pkgincludedir)"
+		-DMYSQLCLIENT_NO_THREADS=ON
+		-DDISABLE_GUI=ON
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		einfo "Building $i"
+			sed \
+			-e "s,__PN__,${DRIVER_NAME},g" \
+			-e "s,__PF__,${MAJOR},g" \
+			-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done;
+	mv "${D}/usr/bin/myodbc-installer" \
+		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
+}
+
+pkg_config() {
+
+	[ "${ROOT}" != "/" ] && \
+		die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
+}
diff --git a/dev-db/postgresql/postgresql-9.2.21.ebuild b/dev-db/postgresql/postgresql-9.2.21.ebuild
index 0b65fea6d89e..a8ad6406baad 100644
--- a/dev-db/postgresql/postgresql-9.2.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.21.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.17.ebuild b/dev-db/postgresql/postgresql-9.3.17.ebuild
index da37bbdb2662..dac5d1ee24c7 100644
--- a/dev-db/postgresql/postgresql-9.3.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.17.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.12.ebuild b/dev-db/postgresql/postgresql-9.4.12.ebuild
index 34d18db8626e..2752511ee382 100644
--- a/dev-db/postgresql/postgresql-9.4.12.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.7.ebuild b/dev-db/postgresql/postgresql-9.5.7.ebuild
index 78752359fde2..30951a16a8dc 100644
--- a/dev-db/postgresql/postgresql-9.5.7.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/sqlite/sqlite-3.17.0.ebuild b/dev-db/sqlite/sqlite-3.17.0.ebuild
index 3e18fb93c4f4..ad572bba348c 100644
--- a/dev-db/sqlite/sqlite-3.17.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.17.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-lang/mujs/mujs-0_p20161202.ebuild b/dev-lang/mujs/mujs-0_p20161202.ebuild
index 0bfbf13ff361..4ef23368b02d 100644
--- a/dev-lang/mujs/mujs-0_p20161202.ebuild
+++ b/dev-lang/mujs/mujs-0_p20161202.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=fd003eceda531e13fbd
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-lang/perl/perl-5.24.1-r2.ebuild b/dev-lang/perl/perl-5.24.1-r2.ebuild
index a6707ed295a4..911d47569e9f 100644
--- a/dev-lang/perl/perl-5.24.1-r2.ebuild
+++ b/dev-lang/perl/perl-5.24.1-r2.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-lang/php/php-7.0.19.ebuild b/dev-lang/php/php-7.0.19.ebuild
index 0521ed7a63fe..e2d2062139bb 100644
--- a/dev-lang/php/php-7.0.19.ebuild
+++ b/dev-lang/php/php-7.0.19.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-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"
+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"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/swig/swig-3.0.12.ebuild b/dev-lang/swig/swig-3.0.12.ebuild
index 88e3f118ffe5..69e1326c644f 100644
--- a/dev-lang/swig/swig-3.0.12.ebuild
+++ b/dev-lang/swig/swig-3.0.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"
 
diff --git a/dev-libs/botan/botan-1.10.16.ebuild b/dev-libs/botan/botan-1.10.16.ebuild
index c8f1d4746ee3..fbc76d7a4ffa 100644
--- a/dev-libs/botan/botan-1.10.16.ebuild
+++ b/dev-libs/botan/botan-1.10.16.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~ppc-macos"
 SLOT="0"
 LICENSE="BSD"
 IUSE="bindist doc python bzip2 gmp libressl ssl static-libs threads zlib"
diff --git a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
index 7e0532a7b914..88421cabb5ea 100644
--- a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
+++ b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/5.6" # subslot is so version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 DEPEND="app-arch/unzip"
diff --git a/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild
index 1ee78f7ab1f6..be15f7e2782d 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 x86"
 IUSE="debug static-libs"
 
 RDEPEND="
diff --git a/dev-libs/icu/icu-58.2-r1.ebuild b/dev-libs/icu/icu-58.2-r1.ebuild
index 6f1f176c977b..892fefef1997 100644
--- a/dev-libs/icu/icu-58.2-r1.ebuild
+++ b/dev-libs/icu/icu-58.2-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/libburn/libburn-1.4.6.ebuild b/dev-libs/libburn/libburn-1.4.6.ebuild
index 4076f269164d..d8cc3b201cbe 100644
--- a/dev-libs/libburn/libburn-1.4.6.ebuild
+++ b/dev-libs/libburn/libburn-1.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="cdio debug static-libs track-src-odirect"
 
 RDEPEND="cdio? ( >=dev-libs/libcdio-0.83 )"
diff --git a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
index c0aef0370091..67c3539760fc 100644
--- a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-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 ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/libevdev/libevdev-1.5.7.ebuild b/dev-libs/libevdev/libevdev-1.5.7.ebuild
index b7441c5584d7..98dc771c0add 100644
--- a/dev-libs/libevdev/libevdev-1.5.7.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.7.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 RESTRICT="test" # Tests need to run as root.
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.7.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.7.7.ebuild
index 380b48ab791a..1fb43bfcbcfa 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.7.7.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.7.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-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"
+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"
 IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libical/libical-2.0.0-r2.ebuild b/dev-libs/libical/libical-2.0.0-r2.ebuild
index 996c267dbb22..7934b9022185 100644
--- a/dev-libs/libical/libical-2.0.0-r2.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples static-libs"
 
 # The GOBJECT_INTROSPECTION build is broken, and upstream has given up
diff --git a/dev-libs/libinput/libinput-1.7.2.ebuild b/dev-libs/libinput/libinput-1.7.2.ebuild
index d23406c2448d..c32a08469ac7 100644
--- a/dev-libs/libinput/libinput-1.7.2.ebuild
+++ b/dev-libs/libinput/libinput-1.7.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libisoburn/libisoburn-1.4.6.ebuild b/dev-libs/libisoburn/libisoburn-1.4.6.ebuild
index 3a1d99d61ee9..46c8b5244cef 100644
--- a/dev-libs/libisoburn/libisoburn-1.4.6.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="acl cdio debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/libisofs-1.4.6.ebuild b/dev-libs/libisofs/libisofs-1.4.6.ebuild
index 23bcc80aae69..d897d62ad158 100644
--- a/dev-libs/libisofs/libisofs-1.4.6.ebuild
+++ b/dev-libs/libisofs/libisofs-1.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
index b17412b5ef36..09d97bed85ed 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 DESCRIPTION="Pthread functions stubs for platforms missing them"
 SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-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"
+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"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/libtasn1/libtasn1-4.10-r2.ebuild b/dev-libs/libtasn1/libtasn1-4.10-r2.ebuild
index 1116f413cb26..8d352cd0e88f 100644
--- a/dev-libs/libtasn1/libtasn1-4.10-r2.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/nettle/nettle-3.3-r1.ebuild b/dev-libs/nettle/nettle-3.3-r1.ebuild
index 2286b2b99bbd..1edc5f1f084e 100644
--- a/dev-libs/nettle/nettle-3.3-r1.ebuild
+++ b/dev-libs/nettle/nettle-3.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6.1" # subslot = libnettle soname version, .1 as broke ABI bug#601512
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
 DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/nss/nss-3.29.5.ebuild b/dev-libs/nss/nss-3.29.5.ebuild
index accee6a437eb..fa3eb33292fb 100644
--- a/dev-libs/nss/nss-3.29.5.ebuild
+++ b/dev-libs/nss/nss-3.29.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/wayland/wayland-1.13.0.ebuild b/dev-libs/wayland/wayland-1.13.0.ebuild
index 5da4ef57104c..809ae9771b28 100644
--- a/dev-libs/wayland/wayland-1.13.0.ebuild
+++ b/dev-libs/wayland/wayland-1.13.0.ebuild
@@ -18,7 +18,7 @@ if [[ $PV = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
index 80cbcbd44d7e..4647224d4fb0 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools"
 
 REQUIRED_USE="test? ( abyss curl cxx ) tools? ( curl )"
diff --git a/dev-lisp/abcl/abcl-0.20.0-r1.ebuild b/dev-lisp/abcl/abcl-0.20.0-r1.ebuild
new file mode 100644
index 000000000000..b8b725f655fd
--- /dev/null
+++ b/dev-lisp/abcl/abcl-0.20.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc"
+
+MY_P="${PN}-src-${PV}"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Common Lisp implementation for the JVM"
+HOMEPAGE="http://common-lisp.net/project/armedbear/"
+SRC_URI="http://common-lisp.net/project/armedbear/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVADOC_FILES="java-${PN}"
+JAVADOC_DIR="javadoc-${PN}"
+
+src_compile() {
+	eant abcl.compile
+	eant abcl.jar
+	if use doc; then
+		find "${S}/src" -type f -name \*.java > "${JAVADOC_FILES}" || die
+		mkdir -p "${JAVADOC_DIR}" || die
+		ejavadoc \
+			-d "${JAVADOC_DIR}" \
+			-docencoding UTF-8 \
+			-charset UTF-8 \
+			-quiet \
+			$(<"${JAVADOC_FILES}") || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar dist/abcl.jar
+	java-pkg_dolauncher ${PN} --java_args "-server -Xrs" --main org.armedbear.lisp.Main
+	use doc && java-pkg_dojavadoc "${JAVADOC_DIR}"
+	einstalldocs
+}
diff --git a/dev-ml/ocaml-cstruct/Manifest b/dev-ml/ocaml-cstruct/Manifest
index 7ba539a07442..2199b1622cde 100644
--- a/dev-ml/ocaml-cstruct/Manifest
+++ b/dev-ml/ocaml-cstruct/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-cstruct-2.4.0.tar.gz 259372 SHA256 a3e19e6a57204a5172c9ed0abd5153d85925b2d32f5ae51a53868a287be647fb SHA512 c37d16605f929aeeda33166183dcbe6b8e367583a8b25fde1bb5a4f9141a11f93e6f5463a500907d8829cb285075a8d2ca7874618a92f817997f76258175cbb3 WHIRLPOOL 8812fff7e3cc2a715e8ba395ab852752c0cf28bf8828e61de3f01b52ffabbc61c13c05b03fc964d1f68e88f33ce08c18b44a070881d3b876283fb987b945c664
 DIST ocaml-cstruct-2.4.1.tar.gz 259399 SHA256 f3c1600e85eb93a58c052e2e9575b48d4dd02784d9b2615dadf861860afa1ee7 SHA512 30c541e50dc221d3d8df54f9a8dfa1f88b10f49b276779f7355a38effdfe048de0300bfcc7e361715f63b696d42bd11aa120df6b4058d3b24962777e91b1633e WHIRLPOOL 40d1fcf4674ee47595f14583f964850b4e2b8747f788efb947994ae5b59e12115c381afa7ccc269b408df2b0eed1e02967e83a6fa256aca8926401e6b3e0ed75
-DIST ocaml-cstruct-3.0.0.tar.gz 205057 SHA256 65c1b34a71029e52f440831daa8ab97bc4c1502714cf553fbd114726a18b8631 SHA512 7cb55ac6e876a6401463bbad452a1e58e959044b77b5e684bb340559817ebe1d5e632a7e95e16304e85b1db4032279a65e5d8da43a9d165a2e93ecaf2a6301d7 WHIRLPOOL 50756f9c777e7c62e2b8af450a1023a7fc0c5398d351eafe0e26a75a6159038190c2a6161b9fff7fcb4d82a17ab9ec9728ab4686ad146ee583693361208693f3
+DIST ocaml-cstruct-3.0.0.tar.gz 205070 SHA256 b420548a2e286dc9a8c8aed7fd142879b97177a76ad69c6e237df2bb5368a69b SHA512 9b080801e7d714412f4c4e417a90df5e412a69ed7a5c88e83f4212e287bf5687b0585a2f9f6849f254322a0c5d0ed98fba2ebe1b19a5c9d198435efe2a7f38a0 WHIRLPOOL 564332813d55284f6ca84b4d8bd1d93dc0484a21b052c4009162b3c4be5fc104c3c15b9e4f7ed467226cacfe8bbf70d5f827c335a165d6c68fd3946e073b91a7
diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-3.0.0.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-3.0.0-r1.ebuild
similarity index 100%
rename from dev-ml/ocaml-cstruct/ocaml-cstruct-3.0.0.ebuild
rename to dev-ml/ocaml-cstruct/ocaml-cstruct-3.0.0-r1.ebuild
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.590.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.590.0.ebuild
index e49a5972c839..654a9555dd17 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.590.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.590.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/BSD-Resource/BSD-Resource-1.291.100.ebuild b/dev-perl/BSD-Resource/BSD-Resource-1.291.100.ebuild
index 8df996195b3a..8929d34f8d60 100644
--- a/dev-perl/BSD-Resource/BSD-Resource-1.291.100.ebuild
+++ b/dev-perl/BSD-Resource/BSD-Resource-1.291.100.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl module for BSD process resource limit and priority functions"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~ppc sparc x86"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild b/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild
index fdb10d1592ec..410c6f55db51 100644
--- a/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild
+++ b/dev-perl/Carp-Clan/Carp-Clan-6.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Report errors from perspective of caller of a clan of modules"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Class-C3-XS/Class-C3-XS-0.140.0.ebuild b/dev-perl/Class-C3-XS/Class-C3-XS-0.140.0.ebuild
index b5f8d0d46fc4..ff6270654b02 100644
--- a/dev-perl/Class-C3-XS/Class-C3-XS-0.140.0.ebuild
+++ b/dev-perl/Class-C3-XS/Class-C3-XS-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XS speedups for Class::C3"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86 ~x86-solaris"
+KEYWORDS="amd64 ia64 ppc sparc x86 ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Clone/Clone-0.390.0.ebuild b/dev-perl/Clone/Clone-0.390.0.ebuild
index b3eb9f8c5215..bc0a08c86572 100644
--- a/dev-perl/Clone/Clone-0.390.0.ebuild
+++ b/dev-perl/Clone/Clone-0.390.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild
index fe7aa0b74348..417e1d7a52d7 100644
--- a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild
+++ b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Interface to Bzip2 compression library"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~mips sparc x86 ~ppc-aix"
+KEYWORDS="amd64 ia64 ~mips sparc x86 ~ppc-aix"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Curses/Curses-1.360.0.ebuild b/dev-perl/Curses/Curses-1.360.0.ebuild
index e152053c6f6c..21be24a429ac 100644
--- a/dev-perl/Curses/Curses-1.360.0.ebuild
+++ b/dev-perl/Curses/Curses-1.360.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Curses interface modules for Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="+unicode test"
 
 RDEPEND=">=sys-libs/ncurses-5:0=[unicode?]
diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
index f37312ce942a..c497628b0032 100644
--- a/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
+++ b/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
@@ -10,7 +10,7 @@ inherit versionator perl-module
 DESCRIPTION="Dump symbol names or the symbol table"
 
 SLOT="0"
-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 ~x86-macos ~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 ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild b/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild
index 2e9f201e60ee..2ade48333dda 100644
--- a/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild
+++ b/dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get home directory for self or other user"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="+xdg test"
 
 RDEPEND="
diff --git a/dev-perl/File-Remove/File-Remove-1.570.0.ebuild b/dev-perl/File-Remove/File-Remove-1.570.0.ebuild
index 735dd5ad1e33..422ff6eae6b4 100644
--- a/dev-perl/File-Remove/File-Remove-1.570.0.ebuild
+++ b/dev-perl/File-Remove/File-Remove-1.570.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Remove files and directories"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Filter/Filter-1.570.0.ebuild b/dev-perl/Filter/Filter-1.570.0.ebuild
index 5c08ada8dad5..a829f16014eb 100644
--- a/dev-perl/Filter/Filter-1.570.0.ebuild
+++ b/dev-perl/Filter/Filter-1.570.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface for creation of Perl Filters"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-perl/Gtk2/Gtk2-1.249.920.ebuild b/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
index 4c94c61b5ca3..65c6c6f759e1 100644
--- a/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
+++ b/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl bindings for GTK2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
index 371772ab0079..d72f63fb8bf2 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.418.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Compiled List::MoreUtils functions"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 # See XS.pm/LICENSE
 LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
index 081ba4d99d55..5e0d909257e7 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide the missing functionality from List::Util"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test +xs"
 # See MoreUtils.pm/LICENSE
 LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
diff --git a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.230.0.ebuild b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.230.0.ebuild
index 6676e2345924..4b48621db727 100644
--- a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.230.0.ebuild
+++ b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Recursively scan Perl code for dependencies"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
index 5b744039a2eb..bb4652597fb9 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.810.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
 IUSE="libressl test minimal examples"
 
 RDEPEND="
diff --git a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
index 866a52a79a1c..8b2a0be0e7ea 100644
--- a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
+++ b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generate Recursive-Descent Parsers"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test examples"
 
 RDEPEND="
diff --git a/dev-perl/SUPER/SUPER-1.201.411.170.ebuild b/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
index 139fa0199c35..6b35fa7cabe8 100644
--- a/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
+++ b/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="control superclass method dispatch"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild b/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild
index 40d7478ad0cf..148d227665aa 100644
--- a/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild
+++ b/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Retrieve names of code references"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
index 4ea201c0f635..f5b7670ebe07 100644
--- a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
+++ b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Apparently run a function in a higher stack frame"
 
 SLOT="0"
-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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="virtual/perl-Carp"
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild
index 466de9c20dc8..ee495d81ad66 100644
--- a/dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Override subroutines in a module for unit testing"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Text-CSV/Text-CSV-1.940.0.ebuild b/dev-perl/Text-CSV/Text-CSV-1.940.0.ebuild
index 4a64f863e321..c54d6a9b395d 100644
--- a/dev-perl/Text-CSV/Text-CSV-1.940.0.ebuild
+++ b/dev-perl/Text-CSV/Text-CSV-1.940.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manipulate comma-separated value strings"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="test +xs"
 
 RDEPEND="
diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.280.0.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.280.0.ebuild
index 52d8fed1ca55..4cc596b2f31a 100644
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.280.0.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.280.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
index 4ff08f83bf1e..483e942a438f 100644
--- a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
+++ b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module that offers a simple to process namespaced XML names"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
index ce6a91c137d0..2bf5d3f9d117 100644
--- a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
+++ b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class SAX Drivers and Filters"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
index c2db745a1ed5..e79b3b685a26 100644
--- a/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.300.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fast, lightweight YAML loader and dumper"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/glib-perl/glib-perl-1.324.0.ebuild b/dev-perl/glib-perl/glib-perl-1.324.0.ebuild
index 0168ef46f86e..6925ddb55d17 100644
--- a/dev-perl/glib-perl/glib-perl-1.324.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.324.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-php/pecl-redis/pecl-redis-3.1.2.ebuild b/dev-php/pecl-redis/pecl-redis-3.1.2.ebuild
index 3c2df8c79d47..28fa94708b69 100644
--- a/dev-php/pecl-redis/pecl-redis-3.1.2.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-3.1.2.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="PHP extension for interfacing with Redis"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="igbinary +session"
 
 DEPEND="igbinary? (
diff --git a/dev-python/Babel/Babel-2.3.4.ebuild b/dev-python/Babel/Babel-2.3.4.ebuild
index 76f4f5671db3..f21944dd24d8 100644
--- a/dev-python/Babel/Babel-2.3.4.ebuild
+++ b/dev-python/Babel/Babel-2.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-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"
+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"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/PyQt4/PyQt4-4.12.ebuild b/dev-python/PyQt4/PyQt4-4.12.ebuild
index c4bc747d9471..9a6872181c88 100644
--- a/dev-python/PyQt4/PyQt4-4.12.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="X compat dbus debug declarative designer doc examples help kde multimedia
 	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
diff --git a/dev-python/appdirs/appdirs-1.4.3.ebuild b/dev-python/appdirs/appdirs-1.4.3.ebuild
index d910d2172d93..b809f43510ff 100644
--- a/dev-python/appdirs/appdirs-1.4.3.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 6edae925f264..76e70f4ad697 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1 +1,2 @@
 DIST Automat-0.5.0.tar.gz 32599 SHA256 4889ec6763377432ec4db265ad552bbe956768ea3fff39014855308ba79dd7c2 SHA512 7b4fc64e1b3cc514e3513c4be7387309a9e0c6d59ef091131404642b517a324b4a0eb677bee99da038664bd6713f2d2078c621f056e98b35966caf324741eeeb WHIRLPOOL 5d3d258cb0eae2393edd4b12860b4312522c4a0eff7c17724ecf13032b633e1803b3817bd095f5e24a680d6d006ea4a389bd038022ac21376ba4e969e3bc4200
+DIST Automat-0.6.0.tar.gz 31767 SHA256 3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8 SHA512 94f2fa06b0e0e1c0538bcf4bd9046ea40600a018bdd1da2d5bed479877807ad56e448c4f1d7ec87341f80013ae6c35b01201cbe3c4ecae1105419038ed43024d WHIRLPOOL 2e394600dcecd31a362fcd6e8c88a1d228567a85df6c6312eadf00d854f0f5c4a89adaabb319ba57c2aa8fdda110eb3c36f20bca6509585cc14d60670db7c193
diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild
new file mode 100644
index 000000000000..f297b1b7594a
--- /dev/null
+++ b/dev-python/automat/automat-0.6.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+MYPN="Automat"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Self-service finite-state machines for the programmer on the go"
+HOMEPAGE="https://github.com/glyph/automat https://pypi.python.org/pypi/Automat"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/m2r[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+S=${WORKDIR}/${MYP}
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc docs/examples/*.py
+	fi
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	einfo "For additional visualization functionality install these optional dependencies"
+	einfo "    >=dev-python/twisted-16.1.1"
+	einfo "    media-gfx/graphviz[python]"
+}
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
similarity index 90%
rename from dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4.ebuild
rename to dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
index a91b8b0f4d9b..ec0e2e47b428 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
@@ -24,8 +24,8 @@ DEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	doc? (
 		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/rst-linker[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
 	test? (
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
@@ -46,9 +46,8 @@ python_test() {
 	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-
+python_install() {
 	# avoid a collision with dev-python/backports
-	find "${D}" -path '*/backports/__init__.py' -delete || die
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
 }
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
index fc10bae4dc57..e3884c33c56c 100644
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
@@ -31,6 +31,5 @@ python_install_all() {
 python_install() {
 	# main namespace provided by dev-python/backports
 	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
-	rm -f backports/__init__.py || die
-	distutils-r1_python_install
+	distutils-r1_python_install --skip-build
 }
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index 7a1fbf1d16e4..8dc7fc3b2afa 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,2 +1,2 @@
-DIST backports.unittest_mock-1.1.1.tar.gz 3255 SHA256 641bd99befaa09834df2aa5f01a0db27c782758e06d46831bfae6ff91dc5d1be SHA512 82872d9ada74b7e64792b29cd49177d5c54ffd64260ce17628df7df08e9e16ee1456d9f80eacacebb43a5e51ad93868cd49bee84209cf6682385e746bcfc90c4 WHIRLPOOL e1c1728a6a2aa0a2ec58a57b23874deb1167d2e3599a20d5e1331ab97e34798519956cb5b20bed735c7a714b6d258944f32144997a9763462c3d373e28a68267
 DIST backports.unittest_mock-1.2.1.tar.gz 4580 SHA256 3a333a7a7641e4c7657c6086d117f88c61c96249b80dd7aa66eba0806a55a393 SHA512 36218fe1117d62cc1aeea576c6220be7b8dd76b800776001756d157528ff7760791c513751a221ba84790c5b60b8ce62ab2ef17f4d359dd026211dc9c5cbcd5e WHIRLPOOL 1ef33a0537331a2564498e7240bb27c0128fa42ed94f76ec6876e83ea0a0ee27e7b425f44a642b4fe9609d4dcf086bd099ba8666aeaeed589d56d1cd263ed1f5
+DIST backports.unittest_mock-1.3.tar.gz 4687 SHA256 c6d964d75112051576daa60746cc6a66afcdc43f13ea2bda175ca8e278e9b375 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff WHIRLPOOL bd20ee64f45d84274e1ab51aa3df50c66068517f4cd144bea381648433ba62d2fb91b4def06d06403e9d2435980c08d2ca6ddd37270c45ace735401085470f8f
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.1.1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.1.1.ebuild
deleted file mode 100644
index 532b7d54650a..000000000000
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# It is the developer's intention that backports.unittest_mock will be
-# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_PN="${MY_PN//-/_}"
-DESCRIPTION="Backport of unittest.mock"
-HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/mock[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
new file mode 100644
index 000000000000..3b613dc9cf56
--- /dev/null
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# It is the developer's intention that backports.unittest_mock will be
+# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of unittest.mock"
+HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/jaraco-packaging[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	py.test -v || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid a collision with dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/certifi/certifi-2017.1.23.ebuild b/dev-python/certifi/certifi-2017.1.23.ebuild
index 04b6bb18bcae..e6d923189be6 100644
--- a/dev-python/certifi/certifi-2017.1.23.ebuild
+++ b/dev-python/certifi/certifi-2017.1.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/cython/cython-0.25.2.ebuild b/dev-python/cython/cython-0.25.2.ebuild
index 56b6b180aed9..740a984cb59f 100644
--- a/dev-python/cython/cython-0.25.2.ebuild
+++ b/dev-python/cython/cython-0.25.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="doc emacs test"
 
diff --git a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
index f1b05875f8d2..7476d250c25f 100644
--- a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
 
 RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
diff --git a/dev-python/flake8/flake8-2.5.4.ebuild b/dev-python/flake8/flake8-2.5.4.ebuild
index 27b9c91286a2..fbe361afc876 100644
--- a/dev-python/flake8/flake8-2.5.4.ebuild
+++ b/dev-python/flake8/flake8-2.5.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
 HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index a74bd98c2af1..21c7ef9c83f9 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1 +1,2 @@
 DIST hpack-2.3.0.tar.gz 41610 SHA256 51bd9aa8151efd190d70fe87991b1e3b79be0f93f0e34088fba2a8d34877a0a9 SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7 WHIRLPOOL 8f47b6c2a78f915b009c35ecefa517486c27eb45f0b99834718152e14f9e934c23d52981c87b0c39af28fb9cb58d94e5eda07db2e999c37900b76b7aefd64b08
+DIST hpack-3.0.0.tar.gz 5305971 SHA256 0f8f5f92cfa59f91804eabb237d4b18895f3e200e282c41cedf6cd11a4416daa SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6 WHIRLPOOL 3252253a9f489d5bf4bc8ef243f576c99f5fa9a49d2767ca1e7f59ba15da1e00de3b083e6e64f69bb8c3c32bf27b177aaaad94b3cf1aba1c726d473d7b062403
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
index c668992919bb..d4a79cf5156a 100644
--- a/dev-python/hpack/hpack-2.3.0-r1.ebuild
+++ b/dev-python/hpack/hpack-2.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python HPACK header compression"
-HOMEPAGE="http://python-hyper.org/hpack https://pypi.python.org/pypi/hpack"
+HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.python.org/pypi/hpack"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
new file mode 100644
index 000000000000..67d5b0266c6a
--- /dev/null
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python HPACK header compression"
+HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.python.org/pypi/hpack"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove a test that is not part of the mainstream tests
+	# Also, it's data directory is not included in the release
+	rm test/test_hpack_integration.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		py.test -v hpack test/|| die
+	cd test
+}
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 428c149ee27d..bacb7154c90a 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,2 +1,3 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 SHA256 673937480f97ad5a1fc8d78ff937352083c82525905b0f631db841c776a91f76 SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c WHIRLPOOL cc1d761bc636fcdb1d760c04676c50427d6a0940bf739244e738506982116338e108a4d2d2dc016127894d1dea842709a2f667239cdd9320e4f1fcc73e7c86bb
-DIST hyper-h2-3.0.0.tar.gz 2203892 SHA256 67a48d035ffbc4535ddd5cad154ab9cb8511e4f7d1f1d87272616b9d2feb6e22 SHA512 bd878e4b27cf67b46ea8099d8ca86cb91d240520f91543bce777565016a3010ae6f62302aa8d498037b0f122079a6e45f175fc343ca99dfb3c1929566cf16ca3 WHIRLPOOL ac62582108cca422120d6f86e3353cd91a6c0e0ddde571b5e45f9db7089c03487456f15f88d14fbfdf039f074afe248175933ae96cc41a702f1a2621f254f379
+DIST hyper-h2-2.6.2.tar.gz 169942 SHA256 af35878673c83a44afbc12b13ac91a489da2819b5dc1e11768f3c2406f740fe9 SHA512 4bbdb26fabe2ee72e1b22e91dcc2a727d4b5c4e2cc465aaf45a15d004062740db87ef5f35f369fd423cdd6fdb61475f0dc423cbe7cec1bc52ddbe8a7488acf1d WHIRLPOOL c9bf4ca23dea8d6223c1d560cd9a95432c782da75c12f9fb9c269245bfe5aa5322f956c587adf00e7a6b8946a8df6c3e26389bf6f679789a1567c5920bfaa5a0
+DIST hyper-h2-3.0.1.tar.gz 2198911 SHA256 fb77d22e844ea4a81ac9305249f4fcf73d06bf7162687980d9a9d20a63133e6e SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c WHIRLPOOL ed387ca70f29ee507f46712991def5b7db87ff0b79199848b72ef153d60de74c22db046e926f6dd4af3e955af68455324707f54874014b7c17e91b153e48ef02
diff --git a/dev-python/hyper-h2/hyper-h2-2.6.2.ebuild b/dev-python/hyper-h2/hyper-h2-2.6.2.ebuild
new file mode 100644
index 000000000000..3603117b4639
--- /dev/null
+++ b/dev-python/hyper-h2/hyper-h2-2.6.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
+HOMEPAGE="http://python-hyper.org/h2 https://pypi.python.org/pypi/h2"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/hyperframe-4.0.1[${PYTHON_USEDEP}]
+	<dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/hpack-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="${RDEPEND}
+"
diff --git a/dev-python/hyper-h2/hyper-h2-3.0.0.ebuild b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
similarity index 68%
rename from dev-python/hyper-h2/hyper-h2-3.0.0.ebuild
rename to dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
index 63055a4f939f..ef898679cde8 100644
--- a/dev-python/hyper-h2/hyper-h2-3.0.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
@@ -6,26 +6,22 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 
 inherit distutils-r1
 
-MY_PN="h2"
-
 DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="http://python-hyper.org/h2 https://pypi.python.org/pypi/h2"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.python.org/pypi/h2"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
 	>=dev-python/hyperframe-5.0.0[${PYTHON_USEDEP}]
 	<dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
 	>=dev-python/hpack-2.3.0[${PYTHON_USEDEP}]
-	<dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7)
 	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
 "
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index 52b0ba016eb8..80628dda3ba1 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,2 +1,3 @@
 DIST hyperframe-4.0.1.tar.gz 16110 SHA256 8a57365b9c5046819fb7bb9c47eb4b44fd4385b976edf3518940f11725c04e43 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9 WHIRLPOOL ad7283e6f70dabaf932ba77600ededeca357b6fb97ea3e32e2a9d687474bea15618dfc69b3ce8b4864563d05813472e0ddb6000c59f890b3c2fff4b2d8a4a500
 DIST hyperframe-5.0.0.tar.gz 17691 SHA256 b886c7f25dab2e39a95cc01741c56755d11092abbcf33a6e60c465206f6ae7ec SHA512 cb971bfc35938c3b76410432a7b3a677e25e44372fe3005351191e4bbb0fd11564f0e60765d22a96b565e7cc2ac80ea65447673bff2bee36e502bcca89a76491 WHIRLPOOL 251523fd243cf45d0a1d89977b80b632c64d7568686c6591c93180644650a04d047ad925447abc11cd7f0802ccd8fd26c9d829f39dda9a86cb02302c248f59b4
+DIST hyperframe-5.1.0.tar.gz 17851 SHA256 a25944539db36d6a2e47689e7915dcee562b3f8d10c6cdfa0d53c91ed692fb04 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b WHIRLPOOL 96ebdd29cc201cbdaa4604c327f4bf992324458436269ce5ef4f3832cf3abaff1b58e378c81ab3a4160017edba4951a37699c88b78632edb8339c2defed96e07
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
index 623636401610..f53f008741b5 100644
--- a/dev-python/hyperframe/hyperframe-4.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="HTTP/2 framing layer for Python"
-HOMEPAGE="http://python-hyper.org/hyperframe https://pypi.python.org/pypi/hyperframe"
+HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hyperframe/hyperframe-5.0.0.ebuild b/dev-python/hyperframe/hyperframe-5.0.0.ebuild
index 08b1cd0e0dca..f53f008741b5 100644
--- a/dev-python/hyperframe/hyperframe-5.0.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.0.0.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 inherit distutils-r1
 
 DESCRIPTION="HTTP/2 framing layer for Python"
-HOMEPAGE="http://python-hyper.org/hyperframe https://pypi.python.org/pypi/hyperframe"
+HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
new file mode 100644
index 000000000000..f53f008741b5
--- /dev/null
+++ b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 framing layer for Python"
+HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/idna/idna-2.5.ebuild b/dev-python/idna/idna-2.5.ebuild
index 6ad8952e1bd0..695816dac570 100644
--- a/dev-python/idna/idna-2.5.ebuild
+++ b/dev-python/idna/idna-2.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index d7cb27dc81ba..ee9022796bc5 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1 +1,2 @@
 DIST incremental-16.10.1.tar.gz 16066 SHA256 14ad6b720ec47aad6c9caa83e47db1843e2b9b98742da5dda08e16a99f400342 SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e WHIRLPOOL cfc84b426e3cdcfb915b247a928b7e614a415dc7679836c966c8cb7b863477923839fa021f30d0351365939948ce2a8c62be86dce29200a0ac3c76e7b1dc1c6b
+DIST incremental-17.5.0.tar.gz 15527 SHA256 7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3 SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc WHIRLPOOL 7546143aa9bf3f9fecd50dc293e7ad2d5fa5b5efcf8307186e33fbf0e82cb973e14436d7b10243e20b7808e7dce0757ff60720d31d49b7653c4657dfd62ba405
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
new file mode 100644
index 000000000000..73e933cb27ba
--- /dev/null
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Incremental is a small library that versions your Python projects"
+HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.python.org/pypi/incremental"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+#S=${WORKDIR}/${P}
diff --git a/dev-python/jinja/jinja-2.9.5.ebuild b/dev-python/jinja/jinja-2.9.5.ebuild
index 48ac31e0ade5..75f4e2dfd4db 100644
--- a/dev-python/jinja/jinja-2.9.5.ebuild
+++ b/dev-python/jinja/jinja-2.9.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/lxml-3.7.3.ebuild b/dev-python/lxml/lxml-3.7.3.ebuild
index aa4ac99fc2ca..3631e059ba45 100644
--- a/dev-python/lxml/lxml-3.7.3.ebuild
+++ b/dev-python/lxml/lxml-3.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 721b61b97fc7..8d3d0c4cbc5a 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -1 +1,2 @@
 DIST m2r-0.1.5.tar.gz 13202 SHA256 3448f770aed05ca10390d0917cd51836cbf82a2f095bc91507e6291cfab03223 SHA512 78e9e8daa293b2466c95f0adad937fa0bbefaf0dd9663695bb916be13182633e0d462afa5331a595db424420485ef54bbfd4e0625962026fab4ce0c63104bc84 WHIRLPOOL c701aa0a735eda9b7eaab7ff6f384bad7535337f6a7adcfce2d729f33b01aed9213d04fcfe1dc3521b2df0687f2b849a3eb5df628a87ea3ea2697ae389ad8438
+DIST m2r-0.1.6.tar.gz 13615 SHA256 a26bc2e25e0ad3f8650385aea25cf734ac4fcd30e54faec92fd39675da75e527 SHA512 3641cf4013f71fbd43d6cdad530cfd3e909c93709edfbd79d6a51e7121de68e279d3ec4eb7eed391a35902ffa467310bd6b020139b2024c3e80fa44e5f6cc4a7 WHIRLPOOL 4bc6ed787069483f4f4c5bcbb4c9cc448dd2d2edc0a7845e2ca74189a0a8b25040c1fed293e4c4aebf6ea1640f69cb777c4621db79a6008b887b8199247712a9
diff --git a/dev-python/m2r/m2r-0.1.6.ebuild b/dev-python/m2r/m2r-0.1.6.ebuild
new file mode 100644
index 000000000000..6dac7dc65ddb
--- /dev/null
+++ b/dev-python/m2r/m2r-0.1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Markdown to reStructuredText converter"
+HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.python.org/pypi/m2r"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/mistune[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
+	${RDEPEND}
+"
+
+#S=${WORKDIR}/${P}
+
+python_prepare_all() {
+	# fix a Q/A violation, trying to install the tests as an independant package
+	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
+	# remove duped old file in the tarball
+	rm "tests/test_r s.py" || die
+	# add missing test files
+	cp "${FILESDIR}/"test.md tests/ || die
+	cp "${FILESDIR}/"test.rst tests/ || die
+	cp "${FILESDIR}/"m2r.1 ./ || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman m2r.1
+}
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
index d9c90b77195f..79caccad1dcf 100644
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ b/dev-python/mako/mako-1.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index a5ca55e7ba49..62edc8ae2a28 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/paramiko/paramiko-2.1.2.ebuild b/dev-python/paramiko/paramiko-2.1.2.ebuild
index 8ebe5f141675..a17535668170 100644
--- a/dev-python/paramiko/paramiko-2.1.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/pip/pip-9.0.1-r1.ebuild b/dev-python/pip/pip-9.0.1-r1.ebuild
index c5bdb5b577d7..111cd7aa0369 100644
--- a/dev-python/pip/pip-9.0.1-r1.ebuild
+++ b/dev-python/pip/pip-9.0.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 # Check pip/_vendor/vendor.txt for this
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index ec36eeeb5272..1c7f30d63487 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1 +1,2 @@
 DIST pynacl-1.1.1.tar.gz 3099431 SHA256 a251393a93c4bd85e7a2c1c0e938dc8862743ae27d8def87c32b2888ccca049e SHA512 6410f6ed2a474fefd5df425ea7e76fbe527a9d2ed09b36291caf2c5d0e68704e58caa694e06b01ea61323b2ef16ce85c1478191cf49d7eea969395a3d74d09a8 WHIRLPOOL 625589b26591c23976cb0c5c4ec9b53c428f3c3c1a07da187af52183367d625ea5bf4d3038b1fe6c88e5c9d4297b1474137b7f350430faefbdbc43f3e36fd698
+DIST pynacl-1.1.2.tar.gz 3149804 SHA256 448897f0cfe3607dc23a871fa4405ef00926179df27ee8dfd0e46d42c60d8968 SHA512 ce9c720699fc3b808bb569ad9916f5f5ea97fbc49643117b014374ffaf77ce7972a530e9c4cfaca14dcffc8d676b5bce2facf6da99bf2fda4e319b772075e52e WHIRLPOOL e30d1fb88e94976ee334a950726437995cb8aac539cb96c93812f44314d8981dad5969cc1e687638d9100553ed6cf0b5ce2c93e66f3a1cd7aa55db034a76aa33
diff --git a/dev-python/pynacl/pynacl-1.1.2.ebuild b/dev-python/pynacl/pynacl-1.1.2.ebuild
new file mode 100644
index 000000000000..0c6657009781
--- /dev/null
+++ b/dev-python/pynacl/pynacl-1.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/"
+SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
+	dev-libs/libsodium:0/18
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+	# For not using the bundled libsodium
+	export SODIUM_INSTALL=system
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyparsing/pyparsing-2.1.10.ebuild b/dev-python/pyparsing/pyparsing-2.1.10.ebuild
index 76bcf79cd320..c4b4ed5e850d 100644
--- a/dev-python/pyparsing/pyparsing-2.1.10.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.1.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 # not contained in the tarball
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index b730043c8b06..3ec972ea110e 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -10,7 +10,13 @@ DIST pypy-bin-5.7.1-amd64+bzip2+ncurses.tar.lz 7104886 SHA256 76373ee444a173287d
 DIST pypy-bin-5.7.1-x86+bzip2+jit+ncurses+sse2.tar.lz 9956906 SHA256 25638e27a0939268014c35b94f4b5e9031d5f3a92cb51e96adbe4b59befbb579 SHA512 1ef83113f832a71ee4370381f21a07c24059a3b1bd2cad14846f06aa4d8319c14cb3633314f81f6ee898ecd9d2612bd03b72a3c1a87264ff34214f716e13bc4f WHIRLPOOL 8896245974d5a9b7b524edc888399c88e1dd651561017a8688405ad82d9906ff5c81e899cee57eb64506903af583439045dc5fe7f8f5592d071642fb8bb6d9e2
 DIST pypy-bin-5.7.1-x86+bzip2+ncurses+sse2.tar.lz 5958810 SHA256 05228eabb25b02aea0c80aca4902ee3d81c3767e64daae5662c4797b39ed6a07 SHA512 e27e84e4a060a7c20bcb862da7d0f32508f5588753b067d726d7cd43835307853a7409203c0bbb98844ac59affc03ea43dc650266d74c345a1afcb7e528f1a8f WHIRLPOOL 2169a6e306643669573434dc065235dc5272c8dffd34a09b136e5a23cd2b8bb70fef552cdf3d79018c7e3b3b1c4edb4d7dcde0a4feb550827dbeafea514742aa
 DIST pypy-bin-5.7.1-x86+bzip2+ncurses.tar.lz 5984920 SHA256 a1507fb0d55633b28fe6c249291f4dbf0097cfaf2e2a8d36f20636c5ccd34ea3 SHA512 769f62cb3768b762a09f83926ea695d2aea01f8bb3f33d921607f454a9f1d9ab30fc5400787274d1d94a8ca5b82027d737df4e5e693d639b6944c22eb69e75f8 WHIRLPOOL 825a531ae629015022ce1260e11258ee057535ae8e491f9f08fb90cc38a6eda4f02a5f9e32c8ecb85cdeb81c5de9f2353c415abd83d05e107ebce3669560b484
+DIST pypy-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 13029615 SHA256 236b12d1abfea9bca81247be01d77b6e82ca9ce923f4e21cb1fceedf8b752675 SHA512 4234bb85c527999fc9ec91e7187d7b05e9aa5fa9965ac4a7fa7a652f678b1221cd04d119316073c5f8352d7bd533c4a7b1c79f5cafce6eb04f32b0a764fdf36d WHIRLPOOL 2b411e1eda2cb18c8a823bcc75de457d68eb9b6793431e3a3a2950bad0f8f5ba882f3cfc21064d0b3656b66bd7cb1389889cb70cb3c9181669286a1fbe0d229f
+DIST pypy-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 7617650 SHA256 3b8b42a1bc0ca612951452430fc078b8bf81a0dff42eb966fe0e7dc965401d5d SHA512 532d7fd9bdb92b1d5c8e8ebcf60c56fbe2a32b8b89f8650d91b6e0a7cfe6733e3e6b6b232f02a6f24bf9f30569dd8b9cce0b93268d0bb45cd808671ee41be3ae WHIRLPOOL c1a3051c91c747fe60d4bc080749d6b72c79825368da940c4a3ad701d62687ffa6ad81f2e1deb6d7113239443a1fb8e1d07d1e02563c9e59a82d8bc5da3b6ef1
+DIST pypy-bin-5.8.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10744836 SHA256 9d943e832695ec4d66b07ed9a6dc5e58885ea671d96ba7b728d03b18686111f7 SHA512 bd39bad8f292eabae37b384b9f9f36bc221606b1d2d4aa3df8a45fb1f7ad94755d5fe5dbb7983a49c4e44df87f745ce00691bcb3a5b6c197509c360d9b24d24c WHIRLPOOL b473572a5a84b1ab0510f7274038546836ef3f61ed3cea3260f7ee4e4086093555673064f9fd58c2510b2d80848ec276ca7069372826ef466408c6cabdc74424
+DIST pypy-bin-5.8.0-x86+bzip2+ncurses+sse2.tar.lz 6493961 SHA256 41d51005cf935ab395f318d88f0f80dfaf42d9e6c766f1e65bbfb6af0b25f586 SHA512 97075ef6589d4671dd8ea79fb87c42842023b3f9b5539b3aed8ed90785e001d9725937fb21cf1339df6425ddb50e1e9aab42630770ed39bbd96e953c6369c249 WHIRLPOOL a562152061ee390e033e69fda6508d04e53a5ca6f051a49dd14d78021bff4ed9cb4070bc36f3e175c10538246cdb1bf5cc63f5f70daa50ee079d4cf8ead1fde9
+DIST pypy-bin-5.8.0-x86+bzip2+ncurses.tar.lz 6489741 SHA256 6146c19101d34c1ee8dd03b652f34495b816b93ef5bd41332afd5a302e9385c8 SHA512 e15572f318b0c1f1d68cdb8c1068de853443c7b350b8aa25b41db50d075e2bb6c53530a035c31c98b530e96742c10d0e92ca20081ffefbe475d00e0974aa8b85 WHIRLPOOL cd682aafe11aeed7571186fe99b544f8ea7a182b35c2685d09418df7abe05a49e86e8385d909a1627a2e3b30c9c1e09526de8ef45f69d5ca5e0080a4726a6950
 DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512 a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de WHIRLPOOL 896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a
 DIST pypy2-v5.7.1-src.tar.bz2 18940413 SHA256 d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f SHA512 1ad2dddb40c28d2d3e95a9f0730e765d981dee6e2d0664cf1274eb7c1021690a848c3485c846eac8a8b64425b44946b5b2d223058ec4699155a2122ee7d38b75 WHIRLPOOL e0223d889a26f8a5bc5097561dbe617ff9b11972590f3a8d717d572798a2d685540bc6059e4ce4ff73ce0db9d2476a4274f17dad1f825fb780726d6ecd78a4c8
+DIST pypy2-v5.8.0-src.tar.bz2 19163498 SHA256 504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365 WHIRLPOOL 775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d
 DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
 DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
diff --git a/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..f0268e296954
--- /dev/null
+++ b/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch
@@ -0,0 +1,388 @@
+From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 07:14:11 +0200
+Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
+
+http://bugs.python.org/issue1222585
+http://bugs.gentoo.org/show_bug.cgi?id=599918
+---
+ _osx_support.py                | 10 ++---
+ distutils/cygwinccompiler.py   | 21 ++++++++--
+ distutils/emxccompiler.py      | 14 +++++--
+ distutils/sysconfig_cpython.py | 26 ++++++++++---
+ distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
+ distutils/unixccompiler.py     | 55 ++++++++++++++-------------
+ 6 files changed, 112 insertions(+), 51 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index d2aaae7..8bcdb05 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index 767400c..7133097 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
+index a017205..bdc532c 100644
+--- a/distutils/emxccompiler.py
++++ b/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 35f39e4..8dd032d 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -171,10 +171,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -189,19 +191,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -210,13 +220,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index 368f232..4fe1f08 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -67,6 +67,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "cc -pthread -shared"
++    g['LDCXXSHARED'] = "c++ -pthread -shared"
+     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
+     g['AR'] = "ar"
+     g['ARFLAGS'] = "rc"
+@@ -85,6 +86,7 @@ def _init_posix():
+             # just a guess
+             arch = platform.machine()
+         g['LDSHARED'] += ' -undefined dynamic_lookup'
++        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
+         g['CC'] += ' -arch %s' % (arch,)
+ 
+     global _config_vars
+@@ -168,37 +170,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -207,13 +224,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index dee88a5..558b568 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy-bin/pypy-bin-5.8.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.8.0.ebuild
new file mode 100644
index 000000000000..b15095865fdb
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-5.8.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
+CPY_PATCHSET_VERSION="2.7.13-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="Pre-built version of PyPy"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+	amd64? (
+		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gdbm +jit sqlite cpu_flags_x86_sse2 test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	dev-libs/openssl:0=[-bindist]
+	sys-libs/glibc:2.2=
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils
+	doc? ( ${PYTHON_DEPS}
+		dev-python/sphinx )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy/pypy-c
+	usr/lib*/pypy/libpypy-c.so"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use doc && python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy-c libpypy-c.so
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 75f5828762ef..e454f08ba6b6 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,5 @@
 DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512 a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de WHIRLPOOL 896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a
 DIST pypy2-v5.7.1-src.tar.bz2 18940413 SHA256 d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f SHA512 1ad2dddb40c28d2d3e95a9f0730e765d981dee6e2d0664cf1274eb7c1021690a848c3485c846eac8a8b64425b44946b5b2d223058ec4699155a2122ee7d38b75 WHIRLPOOL e0223d889a26f8a5bc5097561dbe617ff9b11972590f3a8d717d572798a2d685540bc6059e4ce4ff73ce0db9d2476a4274f17dad1f825fb780726d6ecd78a4c8
+DIST pypy2-v5.8.0-src.tar.bz2 19163498 SHA256 504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365 WHIRLPOOL 775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d
 DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
 DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
diff --git a/dev-python/pypy/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy/files/5.8.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..f0268e296954
--- /dev/null
+++ b/dev-python/pypy/files/5.8.0_all_distutils_cxx.patch
@@ -0,0 +1,388 @@
+From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 07:14:11 +0200
+Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
+
+http://bugs.python.org/issue1222585
+http://bugs.gentoo.org/show_bug.cgi?id=599918
+---
+ _osx_support.py                | 10 ++---
+ distutils/cygwinccompiler.py   | 21 ++++++++--
+ distutils/emxccompiler.py      | 14 +++++--
+ distutils/sysconfig_cpython.py | 26 ++++++++++---
+ distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
+ distutils/unixccompiler.py     | 55 ++++++++++++++-------------
+ 6 files changed, 112 insertions(+), 51 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index d2aaae7..8bcdb05 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index 767400c..7133097 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
+index a017205..bdc532c 100644
+--- a/distutils/emxccompiler.py
++++ b/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 35f39e4..8dd032d 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -171,10 +171,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -189,19 +191,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -210,13 +220,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index 368f232..4fe1f08 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -67,6 +67,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "cc -pthread -shared"
++    g['LDCXXSHARED'] = "c++ -pthread -shared"
+     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
+     g['AR'] = "ar"
+     g['ARFLAGS'] = "rc"
+@@ -85,6 +86,7 @@ def _init_posix():
+             # just a guess
+             arch = platform.machine()
+         g['LDSHARED'] += ' -undefined dynamic_lookup'
++        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
+         g['CC'] += ' -arch %s' % (arch,)
+ 
+     global _config_vars
+@@ -168,37 +170,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -207,13 +224,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index dee88a5..558b568 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy/pypy-5.8.0.ebuild b/dev-python/pypy/pypy-5.8.0.ebuild
new file mode 100644
index 000000000000..8317a80f1480
--- /dev/null
+++ b/dev-python/pypy/pypy-5.8.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+CPY_PATCHSET_VERSION="2.7.13-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy-bin:0"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	${PYTHON_DEPS}
+	test? ( dev-python/pytest )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			if ! python_is_installed pypy; then
+				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+				eerror
+				eerror "  $ emerge -1v dev-python/pypy-bin"
+				eerror
+				eerror "before attempting to build dev-python/pypy[low-memory]."
+				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+			fi
+
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		if python_is_installed pypy; then
+			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+				einfo "Using already-installed PyPy to perform the translation."
+				local EPYTHON=pypy
+			else
+				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+				einfo "recommends using PyPy for that. If you wish to do so, please unset"
+				einfo "the EPYTHON variable."
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
+	pax-mark m pypy-c libpypy-c.so
+
+	use doc && emake -C pypy/doc html
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy-c libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index b951c87d2ea5..eaf3b675ad26 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -96,8 +96,6 @@ src_prepare() {
 	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-	# disarm implicit -flto
-	eapply "${FILESDIR}"/5.7.1-kill-flto.patch
 
 	sed -e "s^@EPREFIX@^${EPREFIX}^" \
 		-e "s^@libdir@^$(get_libdir)^" \
@@ -107,7 +105,7 @@ src_prepare() {
 	pushd lib-python/2.7 > /dev/null || die
 	# TODO: cpy turkish locale patch now fixes C code
 	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
 	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
 	popd > /dev/null || die
 
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index e2fb319f815d..389bed449008 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -7,9 +7,9 @@ DIST pypy3-bin-5.5.0_alpha-x86+bzip2+ncurses+sse2.tar.lz 5231919 SHA256 6a9848bc
 DIST pypy3-bin-5.5.0_alpha-x86+bzip2+ncurses.tar.lz 5232239 SHA256 d808aa66ecd5b3d868554ad29b0eee3948e3de69390826bcb5e6b8ceb2408037 SHA512 5e107304537855f459cc7bee92d3b2d05e16f2421d2249205c34f40f1f9415ca657f3e0842c79de98fed732e0a2752b280b44880f96eeeaa0d50d4b4bf2c525c WHIRLPOOL 562fe0c00aeb83a74d9f1ccba4ffed70b5efa6592ef04c82ea06c38afc560e97aa02b835de8b69925690149c1d6803ecfbcad7eefd59bdf4462bdbbbf82c2577
 DIST pypy3-bin-5.7.1-amd64+bzip2+jit+ncurses.tar.lz 10329767 SHA256 041d6b6af48ec4a2de0062a2ae48a3d2a8e827d450b76fc4232f4a9eca8cbc47 SHA512 a5959d4bd5d267ea0386e4fab4b86b83f7597aaa3174281f15f180e0c83125af1437c0a693b0d534929c7199df5958a5f48867c72d1ce24494b2238523cde2aa WHIRLPOOL 8eef898eac108726b89751e6af80c112f46800ab1dd4efad118e71adb6c7cbaccbe46360da3be7d5ad5702262a2e377bfc530b7519fc38532123884c84e0c1ee
 DIST pypy3-bin-5.7.1-amd64+bzip2+ncurses.tar.lz 6352387 SHA256 0243a016a7b836af72e6e1172f2a4516b9705169a9ba2318093b5c3005917766 SHA512 a63b02dfc11b7675bd4ccceb58801aeb1fd40d0245196dd7fa9f646e4618f46c8e6c4d95072c6432381064d37bc13cb74fbd383d19f8769f069827a8969e7a95 WHIRLPOOL f09b82a6c8a4dada7597bfbe0b2ecd07d90d724eae3d2cc6f35a69c0f219b420236ed8ad37024ad8f9516d729389cbe919f58a48cf1aa323c3a74220c62b8aa3
-DIST pypy3-bin-5.7.1-x86+bzip2+jit+ncurses+sse2.tar.lz 8453840 SHA256 62def5b073ab62d1dbfa87a0d42dd7eb3d61bc4e3652895c917debf179863c78 SHA512 b9c0b127990afbcdd4ee2adc3cb4909db39078467249ef8e5aed127962b9066dc9456273a5d74c5c30e088fe5c7906efaf57e70004c1976173ef47a95d300c46 WHIRLPOOL 906e6a4bf08b137c8d676c58b6fd67e8ef8a2d4dabb67cdd88c335e70f633380af45499d8fe740b63da1265dd630febb7b3ab672a61f590c84f06161aca7f4d8
-DIST pypy3-bin-5.7.1-x86+bzip2+ncurses+sse2.tar.lz 5425311 SHA256 cf261a6cd49906acae44dd53fa96ba1911c27f3d563b817f39ea6db7a3e8652d SHA512 58231cdd747f4e515af095f8f1bac61ca1fd8c670fb194ffc7103d277d28394a577f1aaad6673236edd6136844d1e7dea6bc900660ac598d59c6a1e2799a726b WHIRLPOOL b09aea2f29376f2886f078f93f2bcd630fc0d4894630d5bb2e6d1e2bae0fda5bc7a7c10c4cc74ed576f605a0c862784f82eba1ec8110e4bc0a68679723f355fa
-DIST pypy3-bin-5.7.1-x86+bzip2+ncurses.tar.lz 5425898 SHA256 33811bbeb290c777ae40881e0dfceb678d661b3bd56fc8e9a7247d367db44879 SHA512 19b3eb9f08a7bc89a8c41024b70529b6c1721a6e4ff907e53c06e99787b7b9356c08e554212b7f6e599f40a4cfaec09e765e0504e4b32e2191f7b5071f307d16 WHIRLPOOL 5f9e61550cfa2a983ca3b30eb3569caec9e202d713d4f0513a01e08ec402a6824ab04cd2585019b389f7c4486ef259a333d2c1087a9fe00e33899d9975e80599
+DIST pypy3-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 10706804 SHA256 fd8e3550426d747f65d52fb2edbe5b9133c1946eed5f1ada5a454fe5a99b489f SHA512 38e46503ba50987a36b68e7d6316b64a00c1e2fa0d2d0b0e0e517bbfa96cb777522346d2c4a78cc7bdf44fa237453dc97867f9323785ba38b21c1f1058d5e701 WHIRLPOOL 59ecc9f9c5d4a29819d0911cc1402f38bd9708ec3e28ba90cb33159b88e11a150a33390c2a73e26831de578ec77598018945e001a1bc3e8f2659b17743a3cdf6
+DIST pypy3-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 6626453 SHA256 f840fba90a52e0bfaf9f7f3197f47823154709b86b33dbe61df1f721d8eb46ef SHA512 51d418668c48f8e2d740264855e193353900d56893c0fc81de09e8fab338a36a696a725dd3387ee1d626f82e8319b797bfa4957a5cc8f0b11610b3e6ece67539 WHIRLPOOL 45348517cb0bf8e98ac53149314288716cf8ee972505c354192a46b6472fff694cc037689f2f61707396ed55b9baebe35fa4e99695789f93cb8edeaa08e71fe2
 DIST pypy3-v5.7.1-src.tar.bz2 28811162 SHA256 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0 SHA512 f8ead8214ad7d89fe80e24d97b13ece7f2c80b2f11446257a2eab0e3025fc7d8fec26474b0e9eb2b2e3ccd629532dd062829459361b601add12e40793bd5aa60 WHIRLPOOL 180a5cb39c9a5e3840f4940463dd9cccf44486f11a657d2ac644d1eac4561068f08905fdadc495918fb0ceaf018d4b85a3e5756ca6d99a020310b46bdb16ef87
+DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
 DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168 WHIRLPOOL 6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3
 DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e
diff --git a/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..5d89ce2711cc
--- /dev/null
+++ b/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch
@@ -0,0 +1,342 @@
+From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 17:42:33 +0200
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
+
+https://bugs.python.org/issue1222585
+---
+ _osx_support.py                | 10 +++---
+ distutils/cygwinccompiler.py   | 21 +++++++++--
+ distutils/sysconfig_cpython.py | 25 ++++++++++---
+ distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
+ distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
+ 5 files changed, 100 insertions(+), 45 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index 13fcd8b..0525be1 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index c879646..a6157fb 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc -O -Wall',
+                              compiler_so='gcc -mdll -O -Wall',
+                              compiler_cxx='g++ -O -Wall',
++                             compiler_so_cxx='g++ -mdll -O -Wall',
+                              linker_exe='gcc',
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
++                                           entry_point),
++                             linker_exe_cxx='g++',
++                             linker_so_cxx='%s %s %s'
++                                        % (self.linker_dll_cxx, shared_option,
+                                            entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 573724d..0a04f33 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index a0a8dec..aa97c4e 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -72,6 +72,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "cc -pthread -shared"
++    g['LDCXXSHARED'] = "c++ -pthread -shared"
+     g['EXT_SUFFIX'] = so_ext
+     g['SHLIB_SUFFIX'] = so_ext
+     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
+@@ -156,36 +157,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -194,13 +211,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index 254b22d..c9cacc1 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild
index 9d7fd4408973..a69f3049b290 100644
--- a/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild
@@ -16,25 +16,13 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
 	amd64? (
 		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
 		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
 	)"
 
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
 LICENSE="MIT"
 # XX from pypy3-XX.so module suffix
 SLOT="0/57"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit sqlite cpu_flags_x86_sse2 test tk"
+KEYWORDS="~amd64"
+IUSE="gdbm +jit sqlite test tk"
 
 # yep, world would be easier if people started filling subslots...
 RDEPEND="
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.8.0-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.8.0-r1.ebuild
new file mode 100644
index 000000000000..17abeccf908b
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-5.8.0-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# some random parts need python 2...
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
+MY_P=pypy3-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	amd64? (
+		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+	)"
+
+LICENSE="MIT"
+# XX from pypy3-XX.so module suffix
+SLOT="0/58"
+KEYWORDS="~amd64"
+IUSE="gdbm +jit sqlite test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	dev-libs/openssl:0=[-bindist]
+	sys-libs/glibc:2.2=
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils
+	test? ( ${PYTHON_DEPS} )"
+#	doc? ( ${PYTHON_DEPS}
+#		dev-python/sphinx )
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy3/pypy3-c
+	usr/lib*/pypy3/libpypy3-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	mv pypy/module/cpyext/include/*.h include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	#use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy3-c libpypy3-c.so
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy3
+	einfo "Installing PyPy ..."
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python pypy3-c libpypy3-c.so
+	fperms a+x ${dest}/pypy3-c ${dest}/libpypy3-c.so
+	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
+			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	#use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 3bd62e86f5f3..84c8dbad617f 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,3 +1,4 @@
 DIST pypy3-v5.7.1-src.tar.bz2 28811162 SHA256 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0 SHA512 f8ead8214ad7d89fe80e24d97b13ece7f2c80b2f11446257a2eab0e3025fc7d8fec26474b0e9eb2b2e3ccd629532dd062829459361b601add12e40793bd5aa60 WHIRLPOOL 180a5cb39c9a5e3840f4940463dd9cccf44486f11a657d2ac644d1eac4561068f08905fdadc495918fb0ceaf018d4b85a3e5756ca6d99a020310b46bdb16ef87
+DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
 DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168 WHIRLPOOL 6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3
 DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e
diff --git a/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..5d89ce2711cc
--- /dev/null
+++ b/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch
@@ -0,0 +1,342 @@
+From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 17:42:33 +0200
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
+
+https://bugs.python.org/issue1222585
+---
+ _osx_support.py                | 10 +++---
+ distutils/cygwinccompiler.py   | 21 +++++++++--
+ distutils/sysconfig_cpython.py | 25 ++++++++++---
+ distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
+ distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
+ 5 files changed, 100 insertions(+), 45 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index 13fcd8b..0525be1 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index c879646..a6157fb 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc -O -Wall',
+                              compiler_so='gcc -mdll -O -Wall',
+                              compiler_cxx='g++ -O -Wall',
++                             compiler_so_cxx='g++ -mdll -O -Wall',
+                              linker_exe='gcc',
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
++                                           entry_point),
++                             linker_exe_cxx='g++',
++                             linker_so_cxx='%s %s %s'
++                                        % (self.linker_dll_cxx, shared_option,
+                                            entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 573724d..0a04f33 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index a0a8dec..aa97c4e 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -72,6 +72,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "cc -pthread -shared"
++    g['LDCXXSHARED'] = "c++ -pthread -shared"
+     g['EXT_SUFFIX'] = so_ext
+     g['SHLIB_SUFFIX'] = so_ext
+     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
+@@ -156,36 +157,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -194,13 +211,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index 254b22d..c9cacc1 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy3/pypy3-5.7.1-r2.ebuild b/dev-python/pypy3/pypy3-5.7.1-r2.ebuild
index e61103af45bd..e0a8417672ea 100644
--- a/dev-python/pypy3/pypy3-5.7.1-r2.ebuild
+++ b/dev-python/pypy3/pypy3-5.7.1-r2.ebuild
@@ -16,8 +16,8 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
 LICENSE="MIT"
 # XX from pypy3-XX.so module suffix
 SLOT="0/57"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 tk"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
@@ -97,32 +97,12 @@ src_prepare() {
 src_configure() {
 	tc-export CC
 
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
 	local args=(
 		--shared
 		$(usex jit -Ojit -O2)
 		$(usex sandbox --sandbox '')
 
-		${jit_backend}
+		--jit-backend=auto
 
 		pypy/goal/targetpypystandalone
 	)
diff --git a/dev-python/pypy3/pypy3-5.8.0.ebuild b/dev-python/pypy3/pypy3-5.8.0.ebuild
new file mode 100644
index 000000000000..e2f58d805be1
--- /dev/null
+++ b/dev-python/pypy3/pypy3-5.8.0.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+MY_P=pypy3-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/58"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+	low-memory? ( virtual/pypy:0 )
+	!low-memory? ( ${PYTHON_DEPS} )"
+#	doc? ( dev-python/sphinx )
+
+S="${WORKDIR}/${MY_P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		# unset to allow forcing pypy below :)
+		use low-memory && local EPYTHON=
+		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+			einfo "Using PyPy to perform the translation."
+			local EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex sandbox --sandbox '')
+
+		--jit-backend=auto
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
+	pax-mark m pypy3-c libpypy3-c.so
+
+	#use doc && emake -C pypy/doc html
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy3
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy3-c libpypy3-c.so
+	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
+			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	#use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 02160d99a1f4..7291b119ea06 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -85,8 +85,6 @@ src_prepare() {
 	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-	# disarm implicit -flto
-	eapply "${FILESDIR}"/5.7.1-kill-flto.patch
 
 	sed -e "s^@EPREFIX@^${EPREFIX}^" \
 		-e "s^@libdir@^$(get_libdir)^" \
@@ -94,7 +92,7 @@ src_prepare() {
 
 	# apply CPython stdlib patches
 	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
 	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
 	popd > /dev/null || die
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
index f43d3dfbf727..746dbf6b8652 100644
--- a/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 680394bf4d6b..17b9e5f00f3f 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,5 +1,2 @@
-DIST python-novaclient-6.0.0.tar.gz 288335 SHA256 68fb4e75012a66d23198ca9c6cdc425cd9e0ce750bf759af6cd48fdb19ee6068 SHA512 b14a2ce3471e8853f9ccd67ed95779b8c9b9d6152eafb777c5b48c188f68a3046ff3886c02b76e1b04a4e9d7abf9bc6665f99ff6819fd9b0ee69fe4991dafde6 WHIRLPOOL b5e6853eb9147724879eceed8d08bacca6d2ecfca9527a49fb5fc4d0b31566bb9c9ca1597e4dfaf3dd6a15ce28ad145afc584f0cf0837c65cee17c38ea54cd5d
 DIST python-novaclient-6.0.1.tar.gz 288613 SHA256 2b7d4c660f46d8d7f4eb454fa9da4e8d838a81abc45834891c756393beeb264e SHA512 20bbd40bed2328c6bceba6e0057b541e949d1ea1f7c37190d2ef07bed164a2cf20927b2e7a1b26c349038fca625873e189dad150b4a3e801f9211388ab3996c7 WHIRLPOOL 5cce33c00730cf5e3c81a3c9e3207331161650340bf5b240bfbd687cdf5f2301c81be194b0e19d62e8660b9f4b3622dd241ce4fee511e83afb1769e6a101bb52
-DIST python-novaclient-7.1.0.tar.gz 282062 SHA256 fe69d9c95447381d563f0828359920730d38d5fa6f23af1215d4958479d1b9cb SHA512 4be552a69b8f33641aae1381ebdb0cd354f4d28c82cfe474cbcc7ed9def9a0537aee56a49cb33b48a341a7fab511eb2b3c0d9e5c718f70cd063fb0d553fb6325 WHIRLPOOL c2a8540151a978e6c9cd21d0acf675f0f6df87df5df177a615c1bc9038114f34355faf2238dc5c1b978160719b42daf0e9a1ef78b692abf4cd7cccc42e70af8f
-DIST python-novaclient-7.1.1.tar.gz 283129 SHA256 119a6f749cad3c752e7140beaacc64aa4ffd4b1e9913c8587d29b8abe918a29f SHA512 c8983cdcce3e506f5aa2288211b6b2fdded5bf65266a7740ed070aa26b27590f053cbd0a577fd34d71490deaf6ca4d3cfffb5e079289174312110ac602a06dbf WHIRLPOOL 0b2f5a02392b470b8f3816f9166331b6b198bdf16ec6a30b8481826229e63e861a9cc5ab3891d07f10546def6aa9b9e7cf57394d4dc3fa9e50deeeae687f1b60
 DIST python-novaclient-7.1.2.tar.gz 284152 SHA256 f342470514fd2ac3553e8b7b5967f0f63905bc062202926c5c3a7c87a035a18a SHA512 6b7e4bc80e07b09756f61624d2cf7b81dccd1d102f22cb9609b7e1de6f091061c513691095467e293b742c40a62c8cabc2d3ff8cbc5492d07763655de4d6c516 WHIRLPOOL 719f77ca3c341e446d46ea132ddb698945a806fa8629e20bce95ef5fa0817a2d216381907b07e7fb3e6bc980a1ef30ab6d95a3fcc047601f5cd7989868959f79
diff --git a/dev-python/python-novaclient/python-novaclient-6.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-6.0.0.ebuild
deleted file mode 100644
index b40efd1fceb1..000000000000
--- a/dev-python/python-novaclient/python-novaclient-6.0.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
-		!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-		!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-		!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
-		!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild b/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild
index cf48064b997d..3255bc30b60c 100644
--- a/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/python-novaclient-7.1.0.ebuild b/dev-python/python-novaclient/python-novaclient-7.1.0.ebuild
deleted file mode 100644
index d033672ac343..000000000000
--- a/dev-python/python-novaclient/python-novaclient-7.1.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-		!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-		!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-7.1.1.ebuild b/dev-python/python-novaclient/python-novaclient-7.1.1.ebuild
deleted file mode 100644
index d73a8c0cb9d7..000000000000
--- a/dev-python/python-novaclient/python-novaclient-7.1.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-		!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-		!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild b/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild
index 7f3cfc478aee..d033672ac343 100644
--- a/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytz/pytz-2017.2.ebuild b/dev-python/pytz/pytz-2017.2.ebuild
index cf13683bb01c..01db57f46172 100644
--- a/dev-python/pytz/pytz-2017.2.ebuild
+++ b/dev-python/pytz/pytz-2017.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-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"
+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"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/requests/requests-2.12.5.ebuild b/dev-python/requests/requests-2.12.5.ebuild
index 107de24c6c3c..2cddb6ead410 100644
--- a/dev-python/requests/requests-2.12.5.ebuild
+++ b/dev-python/requests/requests-2.12.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
index f252c45a4cb2..1988d6791cbe 100644
--- a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
+++ b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/sip/sip-4.19.1.ebuild b/dev-python/sip/sip-4.19.1.ebuild
index ed3eeaa8a77c..21a766bf9cda 100644
--- a/dev-python/sip/sip-4.19.1.ebuild
+++ b/dev-python/sip/sip-4.19.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/spark-parser/Manifest b/dev-python/spark-parser/Manifest
index 3e13f102ce75..f6053ab6988b 100644
--- a/dev-python/spark-parser/Manifest
+++ b/dev-python/spark-parser/Manifest
@@ -1,2 +1,3 @@
 DIST spark_parser-1.5.1.tar.gz 111933 SHA256 b6753103f3744deefde7f841c275e4d15d813059a5b575ca7df28fa45480f83a SHA512 d46e4bf27b867e7e20e5d9d226d606428cc2173afdca27d5f8d26db2515a7ecb89b7a27cb091ff3d7d7c9cde748cc0e027b1f9212a2fc7b75144e156d16c8916 WHIRLPOOL 878054b393b6c2d74e46dcf2ba88f8966c45fedacc08557e31900718bd995cbc51a34b822657c8ee81af11b712cedda7358dfb77261dd5cb9a2150144d52b989
 DIST spark_parser-1.6.0.tar.gz 133871 SHA256 3311ad40c8e0b4aa29edfd1ec93a6c81c3f406a4e8ec4d02db1ec39402fb60a9 SHA512 56a89114b35449f0bcd34e2d8c6363d249b839395827fde791c0ec2e425f75a5e5e48d960a5a3c115ca4c7088ea720aba1be03c8b55611d14b18d07f9873a91c WHIRLPOOL c76d0da7c24b7b9a8bf5b4c79dcb8c9ab5d0dbd6f413df1f4e651a99fb75e003279e8fc5010fa63398c1576ac02df6b142ee3f6b37214d7e1146812e240af97c
+DIST spark_parser-1.6.1.tar.gz 134114 SHA256 77bc483450edb0d6ab22023799e6c77e7c64603774bf716a4effb3b280bdeda5 SHA512 290069ebe37aa4d5dddacefe3a4d48607076990fe1f27f914d154fa48a5249cddd0c9d238b7e4c7a9a52ddfc054a3cd5639e52b618b5f4bc5b833c4e38b21c2b WHIRLPOOL 97552df0c4228c2bde498873c7de36866a6d9d3abcfc69f9fe7101ab889094fcf92ac87e1c62230c9093cc3ecf5705205123a3872ee1e2f8a8540708d16ef2fd
diff --git a/dev-python/spark-parser/spark-parser-1.6.1.ebuild b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
new file mode 100644
index 000000000000..032761c8c32d
--- /dev/null
+++ b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+MY_PN="spark_parser"
+
+DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.python.org/pypi/spark_parser"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/uncompyle6/Manifest b/dev-python/uncompyle6/Manifest
index fc6199e5415c..600cd548564b 100644
--- a/dev-python/uncompyle6/Manifest
+++ b/dev-python/uncompyle6/Manifest
@@ -1 +1,2 @@
+DIST uncompyle6-2.10.1.tar.gz 831835 SHA256 0d44ea6ae48a4639cf492503e12e3dc3b782f0881ca6798cce552875405f945f SHA512 5be7c33749f3a2a02494aceebeeb2cb79bf71c39784dbe4e96cf9a5c6f02af89874bc25ba911308f01414e4ae4d9ac445864505c629d41a2c6f8b2eae2197b2b WHIRLPOOL 47e2d0a51ff497fad8f0af5af7e1b0d830bd2a9f5c359bc000a556564c9b179ad1d233614342ea86cb13087a069ee0d7adc53eef6a216fac0428fe2c659094bd
 DIST uncompyle6-2.9.7.tar.gz 876996 SHA256 28b1f18a7e241b783d4cf7f36d996b35871e61544b7914c909adc3aa54ad6317 SHA512 b528a9db569f0665f78a7eef94c91e0d0d31490cb5e60f9cd2fa286c48f378875db1b5fb68e6d593c009c1ab9b381aab06a07624795177d9d72924d73d257ccc WHIRLPOOL 8735ad27678c9d0885e15ec60156272f822af43fa10173220aee0116c893e8a334d11a70030feb11d7726ae6fa9fc9e1c0e724b07d6756a49b17e90ac0f10957
diff --git a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
new file mode 100644
index 000000000000..2e3cc7ae1c82
--- /dev/null
+++ b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code deparser"
+HOMEPAGE="https://github.com/rocky/python-uncompyle6/ https://pypi.python.org/pypi/uncompyle6"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/xdis-3.3.1
+	<dev-python/xdis-3.4.0
+	>=dev-python/spark-parser-1.6.1
+	<dev-python/spark-parser-1.7.0"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+# only run the recommended "make check" tests
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		emake check || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/webob/webob-1.6.3.ebuild b/dev-python/webob/webob-1.6.3.ebuild
index 9639d2953564..b996728d4263 100644
--- a/dev-python/webob/webob-1.6.3.ebuild
+++ b/dev-python/webob/webob-1.6.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/xdis/Manifest b/dev-python/xdis/Manifest
index 934aff0fec8b..fdbbf3116235 100644
--- a/dev-python/xdis/Manifest
+++ b/dev-python/xdis/Manifest
@@ -1,2 +1,3 @@
 DIST xdis-3.2.4.tar.gz 127507 SHA256 b311253b97a321ab45625089a729ccbf8bcb1319a8c4c0167b719f81c081543c SHA512 6c9274e10f2a41ab4a173c8ae4462374fc7ab444a589ab572172550d0f5284906f7d9c9cf4a640f163f6012d17f40bc5e1c36e5963f8b6106a9c37e420027a97 WHIRLPOOL 5a0910f04e3d9ec70129d5d3b659fe06034e7a6298692d2a776f2616a8b895a539efa7f96972b2adc6986c2475e697552ea071d33bdd22c60bb1e0fec1950dd4
 DIST xdis-3.3.0.tar.gz 146531 SHA256 32eeb690e9376ad404c1fb18c1f87a09345f9beca31cee1ea8f21dd0f0dcaa07 SHA512 ebd7656c04d5583243eae4442409bde910146f7c5f6b66d58933d4b62818345401523428a596f00cca31a9d6fcd2eea877da57ab3e796dc04c92842456454b3c WHIRLPOOL 784c88d905d47d22a0d0ffb0206f57250f535abce9df6b02be16492c47ffe199ebf5f900eb3199e0be2b89a1d96f951971de5ba8ae33be57013870c1e25f828f
+DIST xdis-3.3.1.tar.gz 154152 SHA256 d6e5439269a2abe1fa71ac4cb670ac6dfc9e18a09e0c4acb2f6457f0542d5383 SHA512 93b1a092ae7790e84dfd8dc4128659d48be85c4e00d9914bbd748fad5ec4246bbfc6c19a5c5de366f4bd6d91847dad4ce3c1c3affe8f7608652f2f6e343650e1 WHIRLPOOL d137511eb788cdb43ef5e9165415fb4c7fa4885b9e293d4da7a7c4360e0dad7b00c8ea8df299161cff539a9f7a390d8b39ff6c5697804862259717d54c21f38b
diff --git a/dev-python/xdis/xdis-3.3.1.ebuild b/dev-python/xdis/xdis-3.3.1.ebuild
new file mode 100644
index 000000000000..6d44417a7807
--- /dev/null
+++ b/dev-python/xdis/xdis-3.3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+#PATCHES=( "${FILESDIR}/xdis-test_magic_bytes_error.patch"
+#	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
+#)
+
+python_test() {
+	# Need to rm any pyc files to prevent test failures.
+	rm -R "${S}"/test/__pycache__
+	PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \
+		py.test -v || die "Tests failed under ${EPYTHON}"
+	cd test
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		${EPYTHON} test_pyenvlib.py --verify --simple --compile || die \
+		"Tests failed under ${EPYTHON}"
+}
diff --git a/dev-qt/qtgui/files/qtgui-5.7.1-qclipboard.patch b/dev-qt/qtgui/files/qtgui-5.7.1-qclipboard.patch
new file mode 100644
index 000000000000..42ee58b611fe
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.7.1-qclipboard.patch
@@ -0,0 +1,39 @@
+From 291eba6f8099a0fec8fbd9cf8a1fb67e5c9f4f8d Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Mon, 7 Nov 2016 18:27:17 +0100
+Subject: QClipboard: Fix emitting changed() in XCB
+
+In XCB environment the QClipboard::changed() was not delivered if the
+QClipboard::clear() was issued by other Qt app/process.
+
+If the QClipboard::clear() is used, then the owner in
+xcb_xfixes_selection_notify_event_t is XCB_NONE, so we need make the
+decission to handle this event by the selection_timestamp and our
+m_timestamp[mode].
+
+Task-number: QTBUG-56972
+Change-Id: If4c486ac02223eac506465cac7ff1a07bd02a187
+Reviewed-by: Lars Knoll <lars.knoll@qt.io>
+---
+ src/plugins/platforms/xcb/qxcbclipboard.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp
+index d44ebae..40abef4 100644
+--- a/src/plugins/platforms/xcb/qxcbclipboard.cpp
++++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp
+@@ -723,8 +723,10 @@ void QXcbClipboard::handleXFixesSelectionRequest(xcb_xfixes_selection_notify_eve
+     if (mode > QClipboard::Selection)
+         return;
+ 
+-    // here we care only about the xfixes events that come from non Qt processes
+-    if (event->owner != XCB_NONE && event->owner != owner()) {
++    // Note1: Here we care only about the xfixes events that come from other processes.
++    // Note2: If the QClipboard::clear() is issued, event->owner is XCB_NONE,
++    // so we check selection_timestamp to not handle our own QClipboard::clear().
++    if (event->owner != owner() && event->selection_timestamp > m_timestamp[mode]) {
+         if (!m_xClipboard[mode]) {
+             m_xClipboard[mode].reset(new QXcbClipboardMime(mode, this));
+         } else {
+-- 
+cgit v1.0-4-g1e03
diff --git a/dev-qt/qtgui/qtgui-5.7.1-r1.ebuild b/dev-qt/qtgui/qtgui-5.7.1-r1.ebuild
new file mode 100644
index 000000000000..4f6524102f51
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.7.1-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
+	ibus jpeg libinput +png tslib tuio +udev +xcb"
+REQUIRED_USE="
+	|| ( eglfs xcb )
+	accessibility? ( dbus xcb )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	xcb? ( gles2? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.0.6:=
+	>=sys-libs/zlib-1.2.5
+	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	eglfs? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+	)
+	evdev? ( sys-libs/mtdev )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+		!!x11-libs/cairo[qt4]
+	)
+	gles2? ( media-libs/mesa[gles2] )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		x11-libs/libxkbcommon
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( x11-libs/tslib )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libXi-1.7.4
+		x11-libs/libXrender
+		>=x11-libs/libxcb-1.10:=[xkb]
+		>=x11-libs/libxkbcommon-0.4.1[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+"
+
+PATCHES=( "${FILESDIR}/${P}-qclipboard.patch" ) # QTBUG-56972, KDE bug #348390
+
+QT5_TARGET_SUBDIRS=(
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl
+	eglfs
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev
+	evdev:mtdev:
+	:fontconfig
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2::OPENGL_ES
+	gles2:opengles2:OPENGL_ES_2
+	gtk:gtk3:
+	!:no-gui:
+	:system-harfbuzz:HARFBUZZ
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon-evdev:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib
+	udev:libudev:
+	xcb:xcb:
+	xcb:xcb-glx:
+	xcb:xcb-plugin:
+	xcb:xcb-render:
+	xcb:xcb-sm:
+	xcb:xcb-xlib:
+	xcb:xinput2:
+	xcb::XKB
+	xcb:xrender
+)
+
+src_prepare() {
+	# egl_x11 is activated when both egl and xcb are enabled
+	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+
+	# avoid automagic dep on qtdbus
+	use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
+		src/platformsupport/platformsupport.pro || die
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	# avoid automagic dep on qtnetwork
+	use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
+		src/plugins/generic/generic.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(usex eglfs '-gbm -kms' '')
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		$(qt_use gtk)
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		$(qt_use libinput xkbcommon-evdev)
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use xcb xcb system)
+		$(qt_use xcb xkbcommon-x11 system)
+		$(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-ruby/bcat/bcat-0.6.2-r2.ebuild b/dev-ruby/bcat/bcat-0.6.2-r2.ebuild
index ecf1f4861a11..766cb0af6517 100644
--- a/dev-ruby/bcat/bcat-0.6.2-r2.ebuild
+++ b/dev-ruby/bcat/bcat-0.6.2-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC="man"
 RUBY_FAKEGEM_EXTRADOC="README"
@@ -20,7 +20,8 @@ IUSE=""
 # Collides on /usr/bin/bcat, bug 418301
 RDEPEND="${RDEPEND} !!<app-accessibility/speech-tools-2.1-r3"
 
-ruby_add_bdepend "doc? ( app-text/ronn )"
+ruby_add_bdepend "doc? ( app-text/ronn )
+	test? ( dev-ruby/test-unit:2 )"
 
 ruby_add_rdepend "dev-ruby/rack:*"
 
@@ -32,7 +33,7 @@ each_ruby_test() {
 	# The Rakefile uses weird trickery with load path that causes gems
 	# not to be found. Run tests directly instead and do the trickery
 	# here to support popen calls for the bins in this package.
-	RUBY=${RUBY} RUBYLIB=lib:${RUBYLIB} PATH=bin:${PATH} ${RUBY} -S testrb test/test_*.rb || die
+	RUBY=${RUBY} RUBYLIB=lib:${RUBYLIB} PATH=bin:${PATH} ${RUBY} -S testrb-2 test/test_*.rb || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
index c15c793034fb..06a8755cdc2f 100644
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index d27ba7fd7628..701d254a803b 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,7 +1,6 @@
 DIST capybara-1.1.4.gem 72192 SHA256 33073d7e4920a3e74c61ec46d1afe655eb0f3361187113c5e146df498e4611ed SHA512 102738031281d0fabd645fa6d941cf0a9ddd56f90d53d7cc1c8a7b03a37b6af8f4cddd178e6fc07d6751a539a5039cf20502eabdd49e8001793601bb312b47a3 WHIRLPOOL 81eff318acfdc0806c9f8d4e212068edd57694d44db1e29bbefaa7a4db162f3a2354374d6ab97ad7c2372ff9e6f6bb864ed483050facad5c298c2223a39c63cc
-DIST capybara-2.10.1.gem 242688 SHA256 f6ad4dc40a84f2d90b8625816f25cd53bf15e34b0af02754aa6dc736ed58aab7 SHA512 dcb38b7350dfcee0a6d38711eb80e661fe783c0d04adc41e8b156029189e8a9e12beac0b874886209399c1fb12a70a1f0e1be413715d73b908502cfbbd16c758 WHIRLPOOL f3aba8e2261bdd1997287daedc035fcdb832b5f61881fc525db302679b351043be41322f7e61a6d2893852813e337a841dc8b8c63cba968fe166eb8af137119a
-DIST capybara-2.12.0.gem 252928 SHA256 492cfcfa6763169ccb97655eef3fdb4345f9386ca48ab6ee7919474eac12d834 SHA512 501f6cb16d6065193078ba3e42d84f9c8cdbaf891c6f3bdf0fb6ad9b919f6d138aa0b2ac8d1a882d01004e8140c7e93eac4581aae15956e0ba74dec82b80b46a WHIRLPOOL c3e7ec18dd4ef1feebb359ce9762de289eae9b41d776dfa13e76cbca66377735eea7230e75cae7b8bd35d16c482cc6d27518bc015dc19509b789ffbc4c1886bd
 DIST capybara-2.12.1.gem 252928 SHA256 ac950f6f4645e31b9bbaf0c2b9524556b84ad0ff58b517756dca38baf5f6657c SHA512 8b6225d3b2ec050d3188efd7c3ef6ae7f058f197c80aaf293ed7991a8763a22815d772a759919f62eb8b9d0386ea402667075c9cd2a5613aaa5bc7dc3c1af179 WHIRLPOOL bc470164f8b3f19164bdd825801d8ec42cf53924fee17856b5d65c987f832a4dedf831d9d3f0e07ee6dea727e961c5f998d404ec8a416d3dadf0042292b08ba8
 DIST capybara-2.13.0.gem 257024 SHA256 09d574e170b8042914c08630382ed784694c1b2bd1c04af482fbfd71cd56994d SHA512 35e096fa4aed8fea1456d3271bb0dbeb14215ab856a52071243e76d27aaa25f34b256edf8e391cfe024368555aeb2b68dafc896269d231c01e58c247e7a10ac2 WHIRLPOOL 723a4090cc4a438c45c23a491967043e7a2a9a996df6097b88ce7dd7eb69697f19fdbaa63d4b12c7dea317dbd90456c5ae8dde89899d1888fe0633675daa231f
 DIST capybara-2.14.0.gem 262144 SHA256 728f734a39a4af7612b6f03885a8f885aeb4da44e28ce9bc50ade9814733064f SHA512 423cff1e11a3c2739822ef41c36db89169e9f35628f2e569c90580103926da4a831ae5df56bed636628ea75895f106d924be6ccd73a078257ed86b08d9e7c506 WHIRLPOOL 84321d3eee3285d41dfcb3c1cddf52ddce0c75fc6b345b0d92e3d3dd47d3b21d4accb3ccbe9c4a0cfdfab001c965fb9721df9afefedc5ffbd153c02290e03fef
 DIST capybara-2.14.1.gem 265216 SHA256 a387085b562cb087938a791da62cc5b2d4b40f4fd637668d74888b768a839523 SHA512 e05c92e59e045a49c97d45dfd553b421b4750c0cb6dc8aba493d66b1c3fd9a18303d7c1fc3c77186703311870e55b4afc1cab4e99c3103d0d9b45c6f0e614e84 WHIRLPOOL 5bde5bba881620ea243dd720097c55079092b9fc9a8f325572da3b9e0a1528cca743a27ebbc38838851dd1bb1713bdda90f0d44dfc88380e761869138b985163
+DIST capybara-2.14.2.gem 265728 SHA256 e775e725c1913f3cf0b1412610a4caca7e0f800ad2a4042ad8b5b87257668ab7 SHA512 988bb29c117329ddf81ad9f086f527647bc044a9dbd2102f7b3fdacc76f2b1a799c4441b59c65cd716eb9ceebf67856305dda07328d58b73271f3e7ea8858771 WHIRLPOOL f8c2e05a7fab161b94cf152c34c075447f19c679add755e4ae5e7b7af002b3224add2888587732c889cbbd8337282837511c7b4a8ca5844f00120296aa9dab65
diff --git a/dev-ruby/capybara/capybara-2.10.1.ebuild b/dev-ruby/capybara/capybara-2.10.1.ebuild
deleted file mode 100644
index 7e5b75f8520e..000000000000
--- a/dev-ruby/capybara/capybara-2.10.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( www-client/firefox )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mime-types-1.16:*
-	>=dev-ruby/nokogiri-1.3.3
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rack-test-0.5.4
-	>=dev-ruby/xpath-2.0.0:2"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-}
-
-each_ruby_test() {
-	VIRTUALX_COMMAND=${RUBY}
-	virtualmake -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/capybara/capybara-2.12.0.ebuild b/dev-ruby/capybara/capybara-2.14.2.ebuild
similarity index 90%
rename from dev-ruby/capybara/capybara-2.12.0.ebuild
rename to dev-ruby/capybara/capybara-2.14.2.ebuild
index 2575f8bad6d7..4e501520f353 100644
--- a/dev-ruby/capybara/capybara-2.12.0.ebuild
+++ b/dev-ruby/capybara/capybara-2.14.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
 
@@ -43,6 +43,5 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	VIRTUALX_COMMAND=${RUBY}
-	virtualmake -Ilib -S rspec-3 spec || die "Tests failed."
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
 }
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.4-r1.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.4-r1.ebuild
index c09b33f21a1e..193987182180 100644
--- a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.4-r1.ebuild
+++ b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/log4r/log4r-1.1.10-r2.ebuild b/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
index 4a8581e61f76..1c339cb66103 100644
--- a/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 16f3358df094..e9420fad7e87 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,2 +1,3 @@
 DIST mail-2.6.4-git.tar.gz 963211 SHA256 d3e4a384cf60759a839e07fcf12b8cee4ea47775de66e1999cecce03e70af50c SHA512 b92702db0c989371414ef1f4f2855a2b815d2a46f0b110b4c5d63b79b8baaca80aed957865176c4cc1e7142f1d0edd8e3138a85ab42e510a5bd888f32eba5ee2 WHIRLPOOL b69a5cdb28599bd4c766fc219292e9992c660c8bc644d9d5ab6ef2cba68d1fb7b50826838d9fa98d3e5f3b2cf841aaf312194d48c825dc5e22d94d1c5f68e840
 DIST mail-2.6.5-git.tar.gz 963838 SHA256 6a64b02d12862b22e3535f0820b8595589c6a63f89eaf642aeacbd4181a25a86 SHA512 0048c1c90f211e0037b071506bc26e25b910b4085e870334885cd78804174eb8ca9df87f5e695b3a4866727f6607b94cf202a3ca7a500e9509dc77856fba954f WHIRLPOOL 909c6f4843b6de01808c9ee41687a6e2ac45728c9803a34bcaefb24281074f54e0505899b7ab96e035f53f0b3dce2b742d4d5c8cfaddf2e43240a8bd96893ad1
+DIST mail-2.6.6-git.tar.gz 964019 SHA256 4553ded4ff62bc63f00e9e0702e9b0c47103605e18750657d4db26993faf5410 SHA512 ab97384724bd40603af0a90ab52d8694132dda38837fa77704d857418bfa707244b69f9325405d38231a03f4ad5f213f2f66dee2d89ea72e6df543d3cb2eadfb WHIRLPOOL 537358a63234a73a1afadaf71ecfbefd301c5058b1c1f36b430b5493e9ee451196c141b03765174d79037b7bd052223f570d14e579050d8bd17853cc3e259640
diff --git a/dev-ruby/mail/mail-2.6.6.ebuild b/dev-ruby/mail/mail-2.6.6.ebuild
new file mode 100644
index 000000000000..4a9b4866992c
--- /dev/null
+++ b/dev-ruby/mail/mail-2.6.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md ROADMAP TODO.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
+
+inherit ruby-fakegem versionator
+
+GITHUB_USER="mikel"
+
+DESCRIPTION="An email handling library"
+HOMEPAGE="https://github.com/mikel/mail"
+SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/mime-types-1.16:* <dev-ruby/mime-types-4:*"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
+}
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index ddbfb409cec4..6f88bb16eb8f 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,3 +1 @@
-DIST mime-types-data-3.2015.1120.gem 100864 SHA256 2cc2d944557aacac49d15709247be3fba2028f65762bf474cea0212e80dfdf11 SHA512 4de8a9590add8b7df9685efcb07e9a86c70f73f67c990278ced0b6616ccc3eb7215c016b70e3d65088b93bc73396706d503bce4b62578cb9ff694906a09e5e62 WHIRLPOOL 0b99c8aff19b71cce6b51bcee17e1d9e1d89c9b83332232090de22106df0a956de021396cf92fdfb6b28e7c4063bbd36d6a03507069a024a4c4e484b5d99d17a
-DIST mime-types-data-3.2016.0221.gem 101376 SHA256 f6ce9f679d796f4d2647a93ca3d2c3bca4399924a744cdc3f5063a6b8195cf17 SHA512 1ec4bf90a50bfec9cb39b2f3f0f75aca5c1b257258b7533f14a2a272d6b833e90df35b433bc468d107622958f8c2adc549df694c39c69fbcc733db35175746ac WHIRLPOOL 8f4be1e01266f9b22e244f179bb27e49f801e142832740accfc9d317c61e99285ca0162480dd8c4e369bfe6e71bd1e2966f2e4914ce6e939af9c3b6dd79ebe0e
 DIST mime-types-data-3.2016.0521.gem 101888 SHA256 7542bccff06d70c4ad94d1cf10b7dac6bd89958356e5d0d7f6447168c819be12 SHA512 3eb23e446f25a1b058408bec4f4867177ce42f579d188e3f8f1f31d8268e6566309e7439cdcafec214e54e3b22b7c29896c859bac26556b5573fc149eefeebc5 WHIRLPOOL d0e786fb49a572ccb939eed63ee1b857a52678f4e5c51acab87a6ab9c4d1bdd5a92ea3e2b20fdb5f6d1be0388fcc8b733badd36056b88792fa2015e5f5a5fcd9
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2015.1120.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2015.1120.ebuild
deleted file mode 100644
index 86f54aa246b9..000000000000
--- a/dev-ruby/mime-types-data/mime-types-data-3.2015.1120.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Registry for information about MIME media type definitions"
-HOMEPAGE="https://github.com/mime-types/mime-types-data"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2016.0221.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2016.0221.ebuild
deleted file mode 100644
index 5fd3da10062c..000000000000
--- a/dev-ruby/mime-types-data/mime-types-data-3.2016.0221.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Registry for information about MIME media type definitions"
-HOMEPAGE="https://github.com/mime-types/mime-types-data"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2016.0521.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2016.0521.ebuild
index 5fd3da10062c..aba5a52563f4 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2016.0521.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2016.0521.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
diff --git a/dev-ruby/mime-types/mime-types-2.99.2.ebuild b/dev-ruby/mime-types/mime-types-2.99.2.ebuild
index 48fe7d0a7f7b..a016d369430a 100644
--- a/dev-ruby/mime-types/mime-types-2.99.2.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.99.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc History-Types.rdoc README.rdoc"
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
index 4e6561fa0f70..3b91b7eb17a0 100644
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index 0bde2baab7f6..1846c9ae628f 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,3 +1,4 @@
 DIST oauth2-1.2.0.tar.gz 18949 SHA256 e40fb1edaac68cb83bdbd1d6e2a1c485535278124c48f7b2db4771bb03c927d0 SHA512 2adacdc02752289eba217c6b2dfce0d00325becdbb7983b9fdfb149717ffd58cd235217048e48dc5be3d3c4024c224f8164cb0f9b4d792060554fbcb72e70536 WHIRLPOOL 138076cf3509b08ba40041be126d158ebd1767f043c0838789d28b5bce63b6c5ee49c2acfcf9ce81b9cc0303f618035366e947bc4bbd6e242658e973438cf5fc
 DIST oauth2-1.3.0.tar.gz 20739 SHA256 fc3c1c5d540a7dbf5363a753052394eb67397590e17b15c1daf2d214ef3a5eaf SHA512 18b7a5055bdbecd1a073b0c7e4f9175b70cf0b6df0f98811d7de4a3ff252b9d2e6319cc3c9d9c3564cfe45a96bbd55a1cf0658dd8080918fc03b14e0f0041c9d WHIRLPOOL b5ad6772fd033342585ba03fd0cbf3a1bd74876ff2027f80e7550f9a50d464d5d89b6b570b7949ffc929fbd36ebe389dbfa8e543e78b8f565546a9cb974c0842
 DIST oauth2-1.3.1.tar.gz 21371 SHA256 aee3e9ea7f577650cb0c892fdf9a5318130f7802c9997ff186957fe69b6d7bc1 SHA512 6ea4ce6c711c101f8cfe1450624e5bfe501114dd7888d663e0f5171de9f0efa0957483f1350dfc5bcf5d3a63240b194373df733395fac3fea2fcd55d22e4262a WHIRLPOOL d8dc46a3bfea90937828771a22c216462bd1e38cf8af3152d075359b07a1c60b87d57c57052cb3706c4ef1b03203b16a7a0b0db21e3bfc0a7b138428e4b7b949
+DIST oauth2-1.4.0.tar.gz 21299 SHA256 9f1a4612de8ecb4e17a59a38cd11b12194bd5f73adb86cbc413c763c43936ac5 SHA512 2db67cba2403be8ea5d6f88f9818f295c29c08201f8ea5876c55cffe2fa926be465a11061654adffd77d13da9c7e56353ece7e4595cd9501acdcfeb58573b300 WHIRLPOOL 205460523bc5ccf3798e394b929b1b9fb2f3b5a1c124bd0de9065d4fba651cc8626ac0bb7d14e7fe7e731ff5d5b1dc4df0069fd933711ed7b2a4f619b2bc268b
diff --git a/dev-ruby/oauth2/oauth2-1.4.0.ebuild b/dev-ruby/oauth2/oauth2-1.4.0.ebuild
new file mode 100644
index 000000000000..771387591475
--- /dev/null
+++ b/dev-ruby/oauth2/oauth2-1.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
+HOMEPAGE="https://github.com/intridea/oauth2"
+SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.13
+	>=dev-ruby/jwt-1.0 =dev-ruby/jwt-1*
+	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
+	>=dev-ruby/multi_xml-0.5:0
+	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
+		-e '1irequire "uri"' spec/helper.rb || die
+
+	sed -i -e '/yardstick/,/^end/ s:^:#:' \
+		-e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	CI=true ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
index 4880cd657a58..4fc761ea3385 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 # Use rdoc recipe to avoid obsolete Rakefile
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 4948c8bb1c0f..c0b1b8276746 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1 +1,2 @@
 DIST thor-git-0.19.1.tgz 86389 SHA256 70013a638aa81df39b579cde7c68a1b6418ffa999e596eb89e12cdab14593dff SHA512 67aeaa2822b462c59ea9fd1a197222ce997b0edd30eb714b0a303c816acff82f4fb10a650b8a3c508c796426517ba25a462551fbc73ed7b33d4e16207cad8991 WHIRLPOOL d32b384b06fa338af345f7b13014dbff1bd5aac347437cfc8af8c33e3a14b0054245458e88b1109d769a6e1feb273ec9a7283459cba937bebfa66e8f6653ea05
+DIST thor-git-0.19.4.tgz 88733 SHA256 a155779f9c72061ccc3dd5087bef2a85202d9238be9c4d19ad53879dad924f16 SHA512 a5cc52b23806e6104b12f924324960f2567bcd6c73b72ad47c33da222201b0377e7677b996698774de8adf3eff551926393785323ecf46cb59d72eb0e5b05aa0 WHIRLPOOL b829f34c0729efea408624241d0b2209de549a29d0581d3b4338f1798aa9e9449b32fc27755e33849e7236f53e3da00c4e6f2e2fc8e46e8193b4c1dec7d49386
diff --git a/dev-ruby/thor/thor-0.19.4.ebuild b/dev-ruby/thor/thor-0.19.4.ebuild
new file mode 100644
index 000000000000..3a8b6aaf3850
--- /dev/null
+++ b/dev-ruby/thor/thor-0.19.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_BINWRAP="thor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A scripting framework that replaces rake and sake"
+HOMEPAGE="http://whatisthor.com/"
+
+SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux"
+IUSE="doc"
+
+USE_RUBY="ruby21 ruby22 ruby23" ruby_add_bdepend "
+	test? (
+		dev-ruby/childlabor
+		dev-ruby/webmock:0
+	)"
+
+all_ruby_prepare() {
+	# Remove rspec default options (as we might not have the last
+	# rspec).
+	rm .rspec || die
+
+	# Remove Bundler
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Thorfile || die
+
+	# Remove mandatory coverage collection using simplecov which is not
+	# packaged.
+	sed -i -e '/require .simplecov/,/^  end/ s:^:#:' spec/helper.rb || die
+
+	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
+	# bug 430402
+	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby24)
+			einfo "Skipping tests due to circular dependencies"
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec spec || die
+			;;
+	esac
+}
diff --git a/dev-ruby/unf/unf-0.1.4.ebuild b/dev-ruby/unf/unf-0.1.4.ebuild
index 6c2af8b3e05b..7c813d7c5520 100644
--- a/dev-ruby/unf/unf-0.1.4.ebuild
+++ b/dev-ruby/unf/unf-0.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-tcltk/bwidget/bwidget-1.9.8.ebuild b/dev-tcltk/bwidget/bwidget-1.9.8.ebuild
index 5865118ec024..f2838cb8f07f 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.8.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 DEPEND="dev-lang/tk:0"
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20160523.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20160523.ebuild
index 2ca23fe27621..b49b1024f93d 100644
--- a/dev-tex/bibtexu/bibtexu-3.71_p20160523.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20160523.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 RDEPEND=">=dev-libs/kpathsea-6.2.1:=
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
index 832947c818ca..3679ac2521e1 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
 	mirror://gentoo/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz"
 
 LICENSE="LPPL-1.2"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/dev-texlive/texlive-basic/texlive-basic-2016.ebuild b/dev-texlive/texlive-basic/texlive-basic-2016.ebuild
index 469d67b6f57d..252515d108db 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2016.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2016.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="!<dev-texlive/texlive-latex-2009
 !<dev-texlive/texlive-latexrecommended-2009
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2016.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2016.ebuild
index e94a83c75ca9..88febea021e4 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2016.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
 
 LICENSE=" Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2016
 !=dev-texlive/texlive-latexextra-2007*
diff --git a/dev-texlive/texlive-context/texlive-context-2016.ebuild b/dev-texlive/texlive-context/texlive-context-2016.ebuild
index 432651732620..cd0448deae94 100644
--- a/dev-texlive/texlive-context/texlive-context-2016.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
 
 LICENSE=" BSD GPL-1 GPL-2 GPL-3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 >=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2016.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2016.ebuild
index 6d0128962cb4..154f0e1b6f3c 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2016.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional fonts"
 
 LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !=dev-texlive/texlive-langpolish-2007*
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2016.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2016.ebuild
index 7da42634f4d5..dbdf06863903 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2016.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Recommended fonts"
 
 LICENSE=" BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2016.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2016.ebuild
index df2ced0d1f4b..847ada7f1e53 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2016.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics and font utilities"
 
 LICENSE=" Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !dev-texlive/texlive-psutils
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2016.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2016.ebuild
index 3e2be6ca643d..f6afbdf2c373 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2016.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional formats"
 
 LICENSE=" GPL-2 GPL-3 LPPL-1.3 public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 >=dev-texlive/texlive-latex-2008
diff --git a/dev-texlive/texlive-games/texlive-games-2016.ebuild b/dev-texlive/texlive-games/texlive-games-2016.ebuild
index f7bc45bae7ac..5efb1cddf412 100644
--- a/dev-texlive/texlive-games/texlive-games-2016.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Games typesetting"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2016
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-genericextra/texlive-genericextra-2016.ebuild b/dev-texlive/texlive-genericextra/texlive-genericextra-2016.ebuild
index 122857c80993..4da0a9c6b59a 100644
--- a/dev-texlive/texlive-genericextra/texlive-genericextra-2016.ebuild
+++ b/dev-texlive/texlive-genericextra/texlive-genericextra-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Generic additional packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !<dev-texlive/texlive-latexextra-2016
diff --git a/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2016.ebuild b/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2016.ebuild
index e92fa2998b85..c5daa21892df 100644
--- a/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2016.ebuild
+++ b/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Generic recommended packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2016.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2016.ebuild
index cee106bf6f0f..a27e1b804c71 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2016.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Humanities packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2016
 !dev-tex/lineno
diff --git a/dev-texlive/texlive-langafrican/texlive-langafrican-2016.ebuild b/dev-texlive/texlive-langafrican/texlive-langafrican-2016.ebuild
index dcd923de7f83..eb5bd5cf17e8 100644
--- a/dev-texlive/texlive-langafrican/texlive-langafrican-2016.ebuild
+++ b/dev-texlive/texlive-langafrican/texlive-langafrican-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive African scripts"
 
 LICENSE=" GPL-1 GPL-2 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2016.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2016.ebuild
index abfc232540ba..10165f42e285 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2016.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE=" GPL-2 GPL-3 LPPL-1.3 OFL public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !dev-texlive/texlive-langarab
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2016.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2016.ebuild
index 43134223c868..46f19e5e6b2d 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2016.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2016
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2016.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2016.ebuild
index 069309953a3b..dbe34c5b1f99 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2016.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese/Japanese/Korean (base)"
 
 LICENSE=" BSD GPL-2 GPL-3 LPPL-1.3 MIT "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 >=app-text/texlive-core-2010[cjk]
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2016.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2016.ebuild
index 536c582ebe8c..6668f08e6908 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2016.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Cyrillic"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 >=dev-texlive/texlive-latex-2016
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2016.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2016.ebuild
index d730a1b5cd53..7e437288c263 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2016.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 >=dev-texlive/texlive-latex-2016
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2016.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2016.ebuild
index 9d914130e58e..f9d47a2d69b8 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2016.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive US and UK English"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !dev-texlive/texlive-documentation-english
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2016.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2016.ebuild
index 9111c80dc296..438eb1a3dc65 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2016.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other European languages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !dev-texlive/texlive-langarmenian
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2016.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2016.ebuild
index b38f351b0ea7..ddd69588c700 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2016.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive French"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !dev-texlive/texlive-documentation-french
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2016.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2016.ebuild
index da6d60429a09..b4ac1d401196 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2016.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 OPL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2016.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2016.ebuild
index af26a63f0c49..716d03611c73 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2016.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Greek"
 
 LICENSE=" GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langindic/texlive-langindic-2016.ebuild b/dev-texlive/texlive-langindic/texlive-langindic-2016.ebuild
index 1a727d54fef3..2349f4256959 100644
--- a/dev-texlive/texlive-langindic/texlive-langindic-2016.ebuild
+++ b/dev-texlive/texlive-langindic/texlive-langindic-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Indic scripts"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2016.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2016.ebuild
index 748535183540..faa4ca0ce489 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2016.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !dev-texlive/texlive-documentation-italian
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2016.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2016.ebuild
index 0e617496a914..7209ae98213b 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2016.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Japanese"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2016
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2016.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2016.ebuild
index fb4f3ec5b643..1ade2cf3d40b 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2016.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Korean"
 
 LICENSE=" FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2016
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langother/texlive-langother-2016.ebuild b/dev-texlive/texlive-langother/texlive-langother-2016.ebuild
index ff29b18b223c..9d88540f7793 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2016.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other languages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !<dev-texlive/texlive-basic-2009
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2016.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2016.ebuild
index de8f986c391c..ba0bed23578d 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2016.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE=" GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2016
 >=dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2016.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2016.ebuild
index 989dcbfd1cb8..2c625845708f 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2016.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Portuguese"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !dev-texlive/texlive-documentation-portuguese
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2016.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2016.ebuild
index 49706bfb2649..0fb9c5a1ded8 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2016.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Spanish"
 
 LICENSE=" GPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !dev-texlive/texlive-documentation-spanish
diff --git a/dev-texlive/texlive-latex/texlive-latex-2016.ebuild b/dev-texlive/texlive-latex/texlive-latex-2016.ebuild
index 9f55727fdab6..6304570b10af 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2016.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX fundamental packages"
 
 LICENSE=" GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !!<dev-texlive/texlive-latex-2016
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2016.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2016.ebuild
index 15372edda1da..aeee23604a26 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2016.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
 
 LICENSE=" Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latexrecommended-2016
 >=dev-texlive/texlive-pictures-2016
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2016.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2016.ebuild
index bc14ef1d918b..43730dcb265a 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2016.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2016
 !dev-tex/xkeyval
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2016.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2016.ebuild
index c85915dec810..c101be95f2ca 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2016.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
 
 LICENSE=" BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 "
diff --git a/dev-texlive/texlive-mathscience/texlive-mathscience-2016.ebuild b/dev-texlive/texlive-mathscience/texlive-mathscience-2016.ebuild
index 388399682ad5..1fa5a0db8304 100644
--- a/dev-texlive/texlive-mathscience/texlive-mathscience-2016.ebuild
+++ b/dev-texlive/texlive-mathscience/texlive-mathscience-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Mathematics and science packages"
 
 LICENSE=" BSD GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-fontsrecommended-2016
 >=dev-texlive/texlive-latex-2016
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2016.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2016.ebuild
index bbf68bc4e591..98f5f9c8165f 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2016.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive MetaPost and Metafont packages"
 
 LICENSE=" BSD GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 "
diff --git a/dev-texlive/texlive-music/texlive-music-2016.ebuild b/dev-texlive/texlive-music/texlive-music-2016.ebuild
index 430e30058889..b640db1314be 100644
--- a/dev-texlive/texlive-music/texlive-music-2016.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Music packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 MIT "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2016
 !<app-text/texlive-core-2011
diff --git a/dev-texlive/texlive-omega/texlive-omega-2016.ebuild b/dev-texlive/texlive-omega/texlive-omega-2016.ebuild
index e15e4c750eba..6b44711bc2f9 100644
--- a/dev-texlive/texlive-omega/texlive-omega-2016.ebuild
+++ b/dev-texlive/texlive-omega/texlive-omega-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Omega packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 >=dev-texlive/texlive-latex-2016
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2016.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2016.ebuild
index 1ef19da2b0c7..aff70634292f 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2016.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
 
 LICENSE=" Apache-2.0 BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-plainextra/texlive-plainextra-2016.ebuild b/dev-texlive/texlive-plainextra/texlive-plainextra-2016.ebuild
index 73f826ffb8f6..19fecd990889 100644
--- a/dev-texlive/texlive-plainextra/texlive-plainextra-2016.ebuild
+++ b/dev-texlive/texlive-plainextra/texlive-plainextra-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Plain TeX packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !<dev-texlive/texlive-langvietnamese-2009
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2016.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2016.ebuild
index fa5d14f606f7..00878b1e4ea7 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2016.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive PSTricks"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 >=dev-texlive/texlive-genericrecommended-2016
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2016.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2016.ebuild
index 96fb1805193e..2c2c6b5683c0 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2016.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Publisher styles, theses, etc."
 
 LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2016
 !<dev-texlive/texlive-latexextra-2014
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2016.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2016.ebuild
index bccc09203c39..3de9b20fb9b4 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2016.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2016.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive XeTeX and packages"
 
 LICENSE=" Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2016
 !=app-text/texlive-core-2007*
diff --git a/dev-util/gengetopt/gengetopt-2.22.6.ebuild b/dev-util/gengetopt/gengetopt-2.22.6.ebuild
index 575be2a3df86..c9cdba6201cd 100644
--- a/dev-util/gengetopt/gengetopt-2.22.6.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.22.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
diff --git a/dev-util/strace/strace-4.16.ebuild b/dev-util/strace/strace-4.16.ebuild
index ce19fe29c67d..3cd39c973688 100644
--- a/dev-util/strace/strace-4.16.ebuild
+++ b/dev-util/strace/strace-4.16.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-vcs/mercurial/mercurial-4.2.ebuild b/dev-vcs/mercurial/mercurial-4.2.ebuild
index 2d0430aecdb2..96df70d42b66 100644
--- a/dev-vcs/mercurial/mercurial-4.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 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"
 IUSE="bugzilla emacs gpg test tk"
 
 RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.8.4.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.8.4.ebuild
index 289acc5af61e..6ab21a7a096f 100644
--- a/dev-vcs/tortoisehg/tortoisehg-3.8.4.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-3.8.4.ebuild
@@ -14,8 +14,6 @@ else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
 	EHG_REVISION="stable"
-	KEYWORDS="amd64 x86"
-	SRC_URI=""
 	HG_DEPEND="dev-vcs/mercurial"
 fi
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.1.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.1.3.ebuild
index 84eb5987a578..db138e978751 100644
--- a/dev-vcs/tortoisehg/tortoisehg-4.1.3.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-4.1.3.ebuild
@@ -14,8 +14,6 @@ else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
 	EHG_REVISION="stable"
-	KEYWORDS=""
-	SRC_URI=""
 	HG_DEPEND="dev-vcs/mercurial"
 fi
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.2.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.2.1.ebuild
index 1a2d02ca58b7..3500ebeba028 100644
--- a/dev-vcs/tortoisehg/tortoisehg-4.2.1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-4.2.1.ebuild
@@ -14,8 +14,6 @@ else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
 	EHG_REVISION="stable"
-	KEYWORDS=""
-	SRC_URI=""
 	HG_DEPEND="dev-vcs/mercurial"
 fi
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.2.ebuild
index 1a2d02ca58b7..47c0346d363e 100644
--- a/dev-vcs/tortoisehg/tortoisehg-4.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-4.2.ebuild
@@ -7,15 +7,13 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 eutils
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
 	HG_DEPEND=">=dev-vcs/mercurial-4.1 <dev-vcs/mercurial-4.3"
 else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
 	EHG_REVISION="stable"
-	KEYWORDS=""
-	SRC_URI=""
 	HG_DEPEND="dev-vcs/mercurial"
 fi
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index b48bafeacd5e..11d30fb43625 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -14,8 +14,6 @@ else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
 	EHG_REVISION="stable"
-	KEYWORDS=""
-	SRC_URI=""
 	HG_DEPEND="dev-vcs/mercurial"
 fi
 
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index 35190da081a6..a42f10aad6b0 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1 +1,2 @@
 DIST krename-4.0.9.tar.bz2 244658 SHA256 baf1f426360824c98ee3134a74fe2c93763ea01c15aea8801d6968d676796d85 SHA512 13805de37b816c8475189a35c08febe8657101fb0a2b2a830c92c86320199eec193f582945b0f516f9ac4b08164b17d8af161cb2e890616b2ccf60ed5228dc42 WHIRLPOOL f0107ec77d96e1b47968d17e812425deb93e17e5585e2f5f10ab01d57f78e24efa43b222486d0d6aa18315057d1a5ce63190b9abea559f5e7f033bff5da5fe9f
+DIST krename-4.0.9_p20170610.tar.xz 117888 SHA256 88278f3a3bc68a9acabdf55edb1d2e109adce2d4d78742bde23676f4ee92d760 SHA512 a406650f9c2b9094e21ea5224166b6f621da8cab9720737ded37b92c8fd0942ef10cdedc475a08ab363320719ffb203e3f7e0e72de4e64658fc68ad0600736fa WHIRLPOOL 73e5a162c7319ce16b25a7d55276bb08f438fcc8efeea94abd3297eb6367823b3bf1700663bb6d0d732ce404db4b45340b894e75ad27630c139fe41ab6e55f84
diff --git a/kde-misc/krename/krename-4.0.9_p20170610.ebuild b/kde-misc/krename/krename-4.0.9_p20170610.ebuild
new file mode 100644
index 000000000000..076aa1fbefa9
--- /dev/null
+++ b/kde-misc/krename/krename-4.0.9_p20170610.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Powerful batch file renamer"
+HOMEPAGE="http://www.krename.net/"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif pdf taglib truetype"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	exif? ( media-gfx/exiv2:= )
+	pdf? ( app-text/podofo )
+	taglib? ( media-libs/taglib )
+	truetype? ( media-libs/freetype:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-misc/krename:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package taglib Taglib)
+		$(cmake-utils_use_find_package pdf PoDoFo)
+		$(cmake-utils_use_find_package truetype Freetype)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch
new file mode 100644
index 000000000000..61c07feaee35
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch
@@ -0,0 +1,38 @@
+commit 8efef12eeb377e9087551e333d65631968c80e5f
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sat Jun 10 17:00:25 2017 +0200
+
+    Fix build with future glibc (major/minor macros), BSD compatible
+    
+    Summary:
+    Also adding sys/types.h which is not implicitly included from all over.
+    
+    Thanks-to: [ade] in #kde-devel
+    
+    See also:
+    https://sourceware.org/ml/libc-alpha/2015-11/msg00452.html
+    https://git.reviewboard.kde.org/r/127662/
+    
+    Reviewers: #plasma
+    
+    Subscribers: plasma-devel, kwin, #kwin, adridg
+    
+    Tags: #kwin
+    
+    Differential Revision: https://phabricator.kde.org/D6175
+
+diff --git a/logind.cpp b/logind.cpp
+index fee0f2ff4..bb84af4f9 100644
+--- a/logind.cpp
++++ b/logind.cpp
+@@ -29,6 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include <QDBusMetaType>
+ 
+ #include <sys/stat.h>
++#include <sys/types.h>
++#ifndef major
++#include <sys/sysmacros.h>
++#endif
+ #include <unistd.h>
+ #include "utils.h"
+ 
diff --git a/kde-plasma/kwin/kwin-5.10.1.ebuild b/kde-plasma/kwin/kwin-5.10.1.ebuild
index 3566ab51d844..30a4b71b6a23 100644
--- a/kde-plasma/kwin/kwin-5.10.1.ebuild
+++ b/kde-plasma/kwin/kwin-5.10.1.ebuild
@@ -87,6 +87,8 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-5.8.7-glibc-sysmacros.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
diff --git a/kde-plasma/kwin/kwin-5.8.7.ebuild b/kde-plasma/kwin/kwin-5.8.7.ebuild
index bfbefa0351d9..aba9f3344deb 100644
--- a/kde-plasma/kwin/kwin-5.8.7.ebuild
+++ b/kde-plasma/kwin/kwin-5.8.7.ebuild
@@ -89,6 +89,8 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-glibc-sysmacros.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
diff --git a/kde-plasma/kwin/kwin-5.9.5.ebuild b/kde-plasma/kwin/kwin-5.9.5.ebuild
index 77c9c31ad8b8..222df722d24f 100644
--- a/kde-plasma/kwin/kwin-5.9.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.9.5.ebuild
@@ -88,6 +88,8 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-5.8.7-glibc-sysmacros.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-pinned-launchers.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-pinned-launchers.patch
new file mode 100644
index 000000000000..ea1084d417d2
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-pinned-launchers.patch
@@ -0,0 +1,56 @@
+From 89b244a1ff72925805da6e5f44979ad4cb647468 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org>
+Date: Mon, 22 May 2017 10:08:16 +0200
+Subject: We should not forget the launchers that are not currently shown
+
+Summary:
+The pinned launchers that are assigned to other activities
+will have a -1 as the order. We should not forget them
+when saving to the configuration file.
+
+Reviewers: hein, mart
+
+Reviewed By: hein
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D5933
+---
+ libtaskmanager/tasksmodel.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libtaskmanager/tasksmodel.cpp b/libtaskmanager/tasksmodel.cpp
+index 19f1bca..0150761 100644
+--- a/libtaskmanager/tasksmodel.cpp
++++ b/libtaskmanager/tasksmodel.cpp
+@@ -1545,6 +1545,7 @@ void TasksModel::syncLaunchers()
+     }
+ 
+     QMap<int, QString> sortedShownLaunchers;
++    QStringList sortedHiddenLaunchers;
+ 
+     foreach(const QString &launcherUrlStr, launcherList()) {
+         int row = -1;
+@@ -1564,6 +1565,8 @@ void TasksModel::syncLaunchers()
+ 
+         if (row != -1) {
+             sortedShownLaunchers.insert(row, launcherUrlStr);
++        } else {
++            sortedHiddenLaunchers << launcherUrlStr;
+         }
+     }
+ 
+@@ -1588,7 +1591,8 @@ void TasksModel::syncLaunchers()
+             d->sortedPreFilterRows.replace(sortMapIndices.at(i), preFilterRows.at(i));
+         }
+     }
+-    setLauncherList(sortedShownLaunchers.values());
++
++    setLauncherList(sortedShownLaunchers.values() + sortedHiddenLaunchers);
+     d->launcherSortingDirty = false;
+ }
+ 
+-- 
+cgit v0.11.2
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-startup-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-startup-crash.patch
new file mode 100644
index 000000000000..0c2e27c67ce4
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-startup-crash.patch
@@ -0,0 +1,47 @@
+From d602198f6807bbfa175b6aaaa1bdf1708fce703e Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 22 May 2017 17:37:56 +0200
+Subject: don't check for panel visible during startup
+
+if any kscreen related activities occurred
+during startup, the panel wouldn't be visible
+yet, and this would assert. This often happens
+when a screen gets disabled at startup
+
+CCBUG:377280
+---
+ shell/panelview.cpp   | 1 +
+ shell/shellcorona.cpp | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index 70d74cb..cacf0c0 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -117,6 +117,7 @@ PanelView::~PanelView()
+ 
+ KConfigGroup PanelView::panelConfig(ShellCorona *corona, Plasma::Containment *containment, QScreen *screen)
+ {
++    qWarning()<<"AAAA"<<containment<<screen;
+     if (!containment || !screen) {
+         return KConfigGroup();
+     }
+diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
+index e40da45..b6b5ed8 100644
+--- a/shell/shellcorona.cpp
++++ b/shell/shellcorona.cpp
+@@ -778,7 +778,11 @@ void ShellCorona::screenInvariants() const
+         foreach (const PanelView *panel, panelsForScreen(screen)) {
+             Q_ASSERT(panel->containment());
+             Q_ASSERT(panel->containment()->screen() == id || panel->containment()->screen() == -1);
+-            Q_ASSERT(panel->isVisible());
++            //If any kscreen related activities occurred
++            //during startup, the panel wouldn't be visible yet, and this would assert
++            if (panel->containment()->isUiReady()) {
++                Q_ASSERT(panel->isVisible());
++            }
+         }
+ 
+         screens.insert(screen);
+-- 
+cgit v0.11.2
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.1.ebuild
index 2d09a0fd948a..a3191a795047 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5 multilib qmake-utils
+inherit kde5 qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -112,7 +112,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/ksmserver:4
 	!kde-plasma/ksplash:4
 	!kde-plasma/plasma-workspace:4
-	!x11-misc/notification-daemon
 "
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1-r2.ebuild
similarity index 95%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1-r1.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1-r2.ebuild
index 8b5e8bee765a..3f8d7d475356 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.1-r2.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=6
 
-FRAMEWORKS_MINIMAL="5.33.0"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5 multilib qmake-utils
+inherit kde5 qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -118,7 +117,12 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	# Plasma/5.9 branch
+	"${FILESDIR}/${P}-startup-crash.patch" # KDE bug #377280
+	"${FILESDIR}/${P}-pinned-launchers.patch" # KDE bug #379414
+)
 
 RESTRICT+=" test"
 
diff --git a/mail-mta/msmtp/msmtp-1.6.6.ebuild b/mail-mta/msmtp/msmtp-1.6.6.ebuild
index f005a67184ea..90854789913c 100644
--- a/mail-mta/msmtp/msmtp-1.6.6.ebuild
+++ b/mail-mta/msmtp/msmtp-1.6.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/msmtp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax"
 
 CDEPEND="
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre062.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre062.ebuild
index 0cdfefa0a213..9447686e74d9 100644
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre062.ebuild
+++ b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre062.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/mplus-fonts/62344/${MY_P}.tar.xz"
 
 LICENSE="mplus-fonts ipafont? ( IPAfont )"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ia64 ppc x86 ~ppc-macos ~x86-macos"
 IUSE="ipafont"
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/unifont/unifont-9.0.06.ebuild b/media-fonts/unifont/unifont-9.0.06.ebuild
index d2068993017d..4c9624985151 100644
--- a/media-fonts/unifont/unifont-9.0.06.ebuild
+++ b/media-fonts/unifont/unifont-9.0.06.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-gfx/gimp/gimp-2.8.22.ebuild b/media-gfx/gimp/gimp-2.8.22.ebuild
index b7af7322d504..b21a67bc7a34 100644
--- a/media-gfx/gimp/gimp-2.8.22.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
diff --git a/media-gfx/graphite2/graphite2-1.3.8-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.8-r1.ebuild
index 28deb96b441f..2c5dd10cac5c 100644
--- a/media-gfx/graphite2/graphite2-1.3.8-r1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="perl test"
 
 RDEPEND="
diff --git a/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild b/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild
index 0d619345ead1..eac3e882c372 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.8.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/potrace/potrace-1.14.ebuild b/media-gfx/potrace/potrace-1.14.ebuild
index d14d87678b0a..c7d2500f1e11 100644
--- a/media-gfx/potrace/potrace-1.14.ebuild
+++ b/media-gfx/potrace/potrace-1.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric static-libs"
 
 RDEPEND="sys-libs/zlib"
diff --git a/media-libs/glew/glew-1.13.0.ebuild b/media-libs/glew/glew-1.13.0.ebuild
index ede27dc5d9a3..4725492f80f2 100644
--- a/media-libs/glew/glew-1.13.0.ebuild
+++ b/media-libs/glew/glew-1.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild b/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild
index 51104a16dcb0..3515877032b8 100644
--- a/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/jbig2dec/files/jbig2dec-0.13-CVE-2017-7885.patch b/media-libs/jbig2dec/files/jbig2dec-0.13-CVE-2017-7885.patch
new file mode 100644
index 000000000000..e8ffccd45344
--- /dev/null
+++ b/media-libs/jbig2dec/files/jbig2dec-0.13-CVE-2017-7885.patch
@@ -0,0 +1,29 @@
+From b184e783702246e154294326d03d9abda669fcfa Mon Sep 17 00:00:00 2001
+From: Shailesh Mistry <shailesh.mistry@hotmail.co.uk>
+Date: Wed, 3 May 2017 22:06:01 +0100
+Subject: [PATCH] Bug 697703: Prevent integer overflow vulnerability.
+
+Add extra check for the offset being greater than the size
+of the image and hence reading off the end of the buffer.
+
+Thank you to Dai Ge for finding this issue and suggesting a patch.
+---
+ jbig2dec/jbig2_symbol_dict.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/jbig2dec/jbig2_symbol_dict.c b/jbig2dec/jbig2_symbol_dict.c
+index 4acaba9d0..36225cb1f 100644
+--- a/jbig2_symbol_dict.c
++++ b/jbig2_symbol_dict.c
+@@ -629,7 +629,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+                 byte *dst = image->data;
+ 
+                 /* SumatraPDF: prevent read access violation */
+-                if (size - jbig2_huffman_offset(hs) < image->height * stride) {
++                if ((size - jbig2_huffman_offset(hs) < image->height * stride) || (size < jbig2_huffman_offset(hs))) {
+                     jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "not enough data for decoding (%d/%d)", image->height * stride,
+                                 size - jbig2_huffman_offset(hs));
+                     jbig2_image_release(ctx, image);
+-- 
+2.13.1
+
diff --git a/media-libs/jbig2dec/files/jbig2dec-0.13-CVE-2017-7975.patch b/media-libs/jbig2dec/files/jbig2dec-0.13-CVE-2017-7975.patch
new file mode 100644
index 000000000000..d5e62762b9a5
--- /dev/null
+++ b/media-libs/jbig2dec/files/jbig2dec-0.13-CVE-2017-7975.patch
@@ -0,0 +1,31 @@
+From 5e57e483298dae8b8d4ec9aab37a526736ac2e97 Mon Sep 17 00:00:00 2001
+From: Shailesh Mistry <shailesh.mistry@hotmail.co.uk>
+Date: Wed, 26 Apr 2017 22:12:14 +0100
+Subject: [PATCH] Bug 697693: Prevent SEGV due to integer overflow.
+
+While building a Huffman table, the start and end points were susceptible
+to integer overflow.
+
+Thank you to Jiaqi for finding this issue and suggesting a patch.
+---
+ jbig2dec/jbig2_huffman.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/jbig2dec/jbig2_huffman.c b/jbig2dec/jbig2_huffman.c
+index 511e46170..b4189a12c 100644
+--- a/jbig2_huffman.c
++++ b/jbig2_huffman.c
+@@ -421,8 +421,8 @@ jbig2_build_huffman_table(Jbig2Ctx *ctx, const Jbig2HuffmanParams *params)
+ 
+             if (PREFLEN == CURLEN) {
+                 int RANGELEN = lines[CURTEMP].RANGELEN;
+-                int start_j = CURCODE << shift;
+-                int end_j = (CURCODE + 1) << shift;
++                uint32_t start_j = CURCODE << shift;
++                uint32_t end_j = (CURCODE + 1) << shift;
+                 byte eflags = 0;
+ 
+                 if (end_j > max_j) {
+-- 
+2.13.1
+
diff --git a/media-libs/jbig2dec/files/jbig2dec-0.13-CVE-2017-7976.patch b/media-libs/jbig2dec/files/jbig2dec-0.13-CVE-2017-7976.patch
new file mode 100644
index 000000000000..c6dbd182c616
--- /dev/null
+++ b/media-libs/jbig2dec/files/jbig2dec-0.13-CVE-2017-7976.patch
@@ -0,0 +1,29 @@
+From ed6c5133a1004ce8d38f1b44de85a7186feda95e Mon Sep 17 00:00:00 2001
+From: Shailesh Mistry <shailesh.mistry@hotmail.co.uk>
+Date: Wed, 10 May 2017 17:50:39 +0100
+Subject: [PATCH] Bug 697683: Bounds check before reading from image source
+ data.
+
+Add extra check to prevent reading off the end of the image source
+data buffer.
+
+Thank you to Dai Ge for finding this issue and suggesting a patch.
+---
+ jbig2dec/jbig2_image.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Backported dilfridge@g.o
+
+diff -ruN jbig2dec-0.13.orig/jbig2_image.c jbig2dec-0.13/jbig2_image.c
+--- jbig2dec-0.13.orig/jbig2_image.c	2017-06-10 01:41:16.207939489 +0200
++++ jbig2dec-0.13/jbig2_image.c	2017-06-10 01:46:28.009952461 +0200
+@@ -256,7 +256,8 @@
+     /* general OR case */
+     s = ss;
+     d = dd = dst->data + y * dst->stride + leftbyte;
+-    if (d < dst->data || leftbyte > dst->stride || h * dst->stride < 0 || d - leftbyte + h * dst->stride > dst->data + dst->height * dst->stride) {
++    if (d < dst->data || leftbyte > dst->stride || d - leftbyte + h * dst->stride > dst->data + dst->height * dst->stride ||
++        s - leftbyte + (h - 1) * src->stride + rightbyte > src->data + src->height * src->stride) {
+         return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, "preventing heap overflow in jbig2_image_compose");
+     }
+     if (leftbyte == rightbyte) {
diff --git a/media-libs/jbig2dec/jbig2dec-0.13-r3.ebuild b/media-libs/jbig2dec/jbig2dec-0.13-r3.ebuild
new file mode 100644
index 000000000000..5d681123a460
--- /dev/null
+++ b/media-libs/jbig2dec/jbig2dec-0.13-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A decoder implementation of the JBIG2 image compression format"
+HOMEPAGE="http://ghostscript.com/jbig2dec.html"
+SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
+	test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE="png static-libs test"
+
+RDEPEND="png? ( media-libs/libpng:0= )"
+DEPEND="${RDEPEND}
+	test? ( app-arch/unzip )"
+
+RESTRICT="test"
+# bug 324275
+
+DOCS="CHANGES README"
+
+PATCHES=(
+	"${FILESDIR}/${P}-CVE-2016-9601.patch"
+	"${FILESDIR}/${P}-CVE-2017-9216.patch"
+	"${FILESDIR}/${P}-CVE-2017-7885.patch"
+	"${FILESDIR}/${P}-CVE-2017-7975.patch"
+#	"${FILESDIR}/${P}-CVE-2017-7976.patch"
+)
+
+src_prepare() {
+	default
+
+	if use test; then
+		mkdir "${WORKDIR}/ubc" || die
+		mv -v "${WORKDIR}"/*.jb2 "${WORKDIR}/ubc/" || die
+		mv -v "${WORKDIR}"/*.bmp "${WORKDIR}/ubc/" || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with png libpng)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm {} + || die
+}
diff --git a/media-libs/libepoxy/libepoxy-1.4.2.ebuild b/media-libs/libepoxy/libepoxy-1.4.2.ebuild
index 0f9a9e43e852..14d99a9a66e6 100644
--- a/media-libs/libepoxy/libepoxy-1.4.2.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.4.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/libmtp/libmtp-1.1.12.ebuild b/media-libs/libmtp/libmtp-1.1.12.ebuild
index 9ef2eff9c2a9..80a2b0270821 100644
--- a/media-libs/libmtp/libmtp-1.1.12.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.12.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libsixel/libsixel-1.7.3.ebuild b/media-libs/libsixel/libsixel-1.7.3.ebuild
index 7487180203f4..13adf5b40300 100644
--- a/media-libs/libsixel/libsixel-1.7.3.ebuild
+++ b/media-libs/libsixel/libsixel-1.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/saitoha/libsixel/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
+KEYWORDS="amd64 ia64 x86"
 IUSE="curl gd gtk jpeg png"
 
 RDEPEND="curl? ( net-misc/curl )
diff --git a/media-libs/mesa/mesa-17.0.6.ebuild b/media-libs/mesa/mesa-17.0.6.ebuild
index d3ce0b4c0bd5..59877a56f12a 100644
--- a/media-libs/mesa/mesa-17.0.6.ebuild
+++ b/media-libs/mesa/mesa-17.0.6.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/tiff/tiff-4.0.8.ebuild b/media-libs/tiff/tiff-4.0.8.ebuild
index d84ec1096b0d..00a7e508b8c0 100644
--- a/media-libs/tiff/tiff-4.0.8.ebuild
+++ b/media-libs/tiff/tiff-4.0.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest
index bdd5329a3112..fed97cbd1e25 100644
--- a/media-sound/gogglesmm/Manifest
+++ b/media-sound/gogglesmm/Manifest
@@ -1 +1 @@
-DIST gogglesmm-1.1.1.tar.gz 1395799 SHA256 8698a36f7f1c04364b50d30212f427abdd21c23ca591680e2e0f31b4240f3182 SHA512 71dace0c9075d0624d61b18df073b4039083d6daf551e04c1bf2aa64d4454ea461dfe71d4d33a8a1379c549c8cd3ed235079852cd0e073470ceee76b50b46370 WHIRLPOOL db0b9f159ef854f25538f25aa09a9b525c4160212c14f3565df4e0557d11811769cc66773ebef0cfc623b3ffe6ae0200cadf9dfe67f5b6311da92d51c2ea005c
+DIST gogglesmm-1.1.9.tar.gz 1419421 SHA256 fb1d4d4d14bfedb21821a41798b9abc81c9c8b2f7e028e6f3d828b6d58059dde SHA512 54de949b37e272a2235cf2f910890590f18b12c2b3199cb87bbe393ae659a3a9b7bd47f5a5f43ce035e94b87098c07d534efee2a6c17ebabb9bbed3453126e2e WHIRLPOOL 569728f318e165759cba37725443420550247359c36d0a2ea1e0a872a7162ddeaac98fb99101520b8258f175ba55faa6cb3838e7669568e1b14eb5182f45883b
diff --git a/media-sound/gogglesmm/gogglesmm-1.1.1.ebuild b/media-sound/gogglesmm/gogglesmm-1.1.9.ebuild
similarity index 96%
rename from media-sound/gogglesmm/gogglesmm-1.1.1.ebuild
rename to media-sound/gogglesmm/gogglesmm-1.1.9.ebuild
index 6f8733cb7204..1c71ae8ece56 100644
--- a/media-sound/gogglesmm/gogglesmm-1.1.1.ebuild
+++ b/media-sound/gogglesmm/gogglesmm-1.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-sound/mpg123/mpg123-1.24.0.ebuild b/media-sound/mpg123/mpg123-1.24.0.ebuild
index c82e35974dc1..a31f8a4188a9 100644
--- a/media-sound/mpg123/mpg123-1.24.0.ebuild
+++ b/media-sound/mpg123/mpg123-1.24.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8391debfabdb..a0e2b8bb6dc9 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Jun 2017 17:39:32 +0000
+Sat, 10 Jun 2017 17:39:41 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8391debfabdb..a0e2b8bb6dc9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Jun 2017 17:39:32 +0000
+Sat, 10 Jun 2017 17:39:41 +0000
diff --git a/metadata/md5-cache/app-admin/ansible-2.3.0.0-r1 b/metadata/md5-cache/app-admin/ansible-2.3.0.0-r1
deleted file mode 100644
index 7bdbef3e7cf6..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.3.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jinja-2.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/mock-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git ) 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(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=http://ansible.com/
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jinja-2.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://releases.ansible.com/ansible/ansible-2.3.0.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c8fbab308fcd78ff31bced575bf86753
diff --git a/metadata/md5-cache/app-admin/ansible-2.3.0.0-r2 b/metadata/md5-cache/app-admin/ansible-2.3.0.0-r2
deleted file mode 100644
index 89522d8c2f58..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.3.0.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jinja-2.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/mock-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git ) 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(-)]
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=6
-HOMEPAGE=http://ansible.com/
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jinja-2.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://releases.ansible.com/ansible/ansible-2.3.0.0.tar.gz mirror://gentoo/ansible-2.3.0.0-pycryptodome.patch
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=822494cbde11aff90e95ac4e8335408c
diff --git a/metadata/md5-cache/app-admin/ansible-2.3.1.0 b/metadata/md5-cache/app-admin/ansible-2.3.1.0
index 320178800e40..09cd67f7c560 100644
--- a/metadata/md5-cache/app-admin/ansible-2.3.1.0
+++ b/metadata/md5-cache/app-admin/ansible-2.3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=6
 HOMEPAGE=http://ansible.com/
 IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jinja-2.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://releases.ansible.com/ansible/ansible-2.3.1.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8973b50a2c1627e0fa380d246fd3734d
+_md5_=34e22db94218ed08d39467ace5ad0856
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.5 b/metadata/md5-cache/app-admin/eselect-1.4.5
deleted file mode 100644
index 8d15691f408b..000000000000
--- a/metadata/md5-cache/app-admin/eselect-1.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils )
-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 ~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
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.5.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=f28b94df2fc777f5742c3200c2d7222e
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.8 b/metadata/md5-cache/app-admin/eselect-1.4.8
index 63da0dea0a4b..a718c5854c04 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.8
+++ b/metadata/md5-cache/app-admin/eselect-1.4.8
@@ -4,11 +4,11 @@ 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 ~x64-cygwin ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.8.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=3493e55ad6336ecdd6eec583aef951be
+_md5_=f800eb096b02984a1ae0ad158a92b5b5
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r1 b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r1
index fe07078f9610..2ef15c13a7b2 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r1
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Single process stack of various system monitors
 EAPI=6
 HOMEPAGE=http://www.gkrellm.net/
 IUSE=gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
 SLOT=2
 SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.10.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=f32c3b44f6df5998c70cc4a9664fcc35
+_md5_=7dfb250c865e93fc21aaa727a3ef441e
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26
index e2a9b9968bc6..dadb00ea1f7c 100644
--- a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r26
@@ -4,10 +4,10 @@ DESCRIPTION=A simple utility to read the temperature of SMART capable hard drive
 EAPI=5
 HOMEPAGE=https://savannah.nongnu.org/projects/hddtemp/
 IUSE=network-cron nls selinux
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-hddtemp )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=09445a4136248b9fdcd5cf6d3774fd81
+_md5_=0516f6087a27361d9f4b52bce57e1baa
diff --git a/metadata/md5-cache/app-admin/logrotate-3.12.2 b/metadata/md5-cache/app-admin/logrotate-3.12.2
index f352fd36cf45..f94f041d87d0 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.12.2
+++ b/metadata/md5-cache/app-admin/logrotate-3.12.2
@@ -4,10 +4,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=6
 HOMEPAGE=https://github.com/logrotate/logrotate
 IUSE=acl +cron selinux
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
 SLOT=0
 SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.12.2/logrotate-3.12.2.tar.gz -> logrotate-3.12.2.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=08d4b457e86da5abf1fb697830b97629
+_md5_=86032599ea59689d51075941f764f139
diff --git a/metadata/md5-cache/app-admin/mcelog-152 b/metadata/md5-cache/app-admin/mcelog-152
new file mode 100644
index 000000000000..e45e8d9f3e54
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mcelog-152
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A tool to log and decode Machine Check Exceptions
+EAPI=6
+HOMEPAGE=http://mcelog.org/
+IUSE=selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-mcelog )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/andikleen/mcelog/archive/v152.tar.gz -> mcelog-152.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=18534ccc3ee8e92913aaf9df955ba7d9
diff --git a/metadata/md5-cache/app-arch/bsdsfv-1.18-r2 b/metadata/md5-cache/app-arch/bsdsfv-1.18-r2
index dda2501dc217..772040a772ce 100644
--- a/metadata/md5-cache/app-arch/bsdsfv-1.18-r2
+++ b/metadata/md5-cache/app-arch/bsdsfv-1.18-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=all-in-one SFV checksum utility
 EAPI=6
 HOMEPAGE=http://bsdsfv.sourceforge.net/
-KEYWORDS=amd64 arm ~hppa ~m68k ppc ~s390 ~sh ~sparc x86 ~x86-fbsd ~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
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=81e735ea619fc870fdce82b72d3d22db
+_md5_=c7a10cd78e8fd6e33fb88c48dca93ba4
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6-r8 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r8
index 12bdb8e5b794..f02e5854bf33 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r8
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r8
@@ -3,9 +3,9 @@ DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
 EAPI=5
 HOMEPAGE=http://www.bzip.org/
 IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BZIP2
 SLOT=0
 SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=f994e7e79830578e490371c03a125402
+_md5_=7d951abb9949d3bb034e4299e0bbbc67
diff --git a/metadata/md5-cache/app-arch/libarchive-3.3.1 b/metadata/md5-cache/app-arch/libarchive-3.3.1
index 25f7e2d97043..379443197b3e 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.3.1
+++ b/metadata/md5-cache/app-arch/libarchive-3.3.1
@@ -4,10 +4,10 @@ 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 ~x64-cygwin ~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
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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.3.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=5783e48e66758b0ed15a1ab60c1b967d
+_md5_=386b6e27132ecafd0a2b5839201be232
diff --git a/metadata/md5-cache/app-arch/xar-1.6.1-r1 b/metadata/md5-cache/app-arch/xar-1.6.1-r1
index 7e63eb06a2d2..c9bef08b5244 100644
--- a/metadata/md5-cache/app-arch/xar-1.6.1-r1
+++ b/metadata/md5-cache/app-arch/xar-1.6.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An easily extensible archive format
 EAPI=6
 HOMEPAGE=https://github.com/mackyle/xar
 IUSE=+bzip2 libressl
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2 ) sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://github/mackyle/xar/xar-1.6.1.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=cc841124015c534290d7e680ea8902bf
+_md5_=323eb86ae247a8aae5898645d61e5dfd
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.5 b/metadata/md5-cache/app-backup/amanda-3.4.5
new file mode 100644
index 000000000000..bf588743cba9
--- /dev/null
+++ b/metadata/md5-cache/app-backup/amanda-3.4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt dev-lang/swig >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:= virtual/pkgconfig
+DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
+EAPI=6
+HOMEPAGE=http://www.amanda.org/
+IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
+RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://sourceforge/amanda/amanda-3.4.5.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=61dbea7a5523f47ecbdf8f56863cf921
diff --git a/metadata/md5-cache/app-cdr/burn-cd-1.8.1 b/metadata/md5-cache/app-cdr/burn-cd-1.8.1
index 4ba412745964..df80ef799211 100644
--- a/metadata/md5-cache/app-cdr/burn-cd-1.8.1
+++ b/metadata/md5-cache/app-cdr/burn-cd-1.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Smart console frontend for the cdrkit/cdrtools & dvd+rw-tools
 EAPI=6
 HOMEPAGE=https://github.com/aglyzov/burn-cd/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/cdrtools app-cdr/dvd+rw-tools
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/aglyzov/burn-cd/archive/1.8.1.tar.gz -> burn-cd-1.8.1.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=d2b4ee4bc85710ede45fcaa2d976c396
+_md5_=3c44cc0cfed320726142136bbea4e3e7
diff --git a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3 b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
index 65aa7fc5462d..4db915005b67 100644
--- a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
+++ b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
@@ -3,10 +3,10 @@ DEPEND=virtual/cdrtools sys-devel/m4
 DESCRIPTION=A set of tools for DVD+RW/-RW drives
 EAPI=6
 HOMEPAGE=http://fy.chalmers.se/~appro/linux/DVD+RW/
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/cdrtools
 SLOT=0
 SRC_URI=http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=337b72f9e949ee28392f3d15e976b852
+_md5_=31affffded4fa91d1d5d5a67e43baf34
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.1.20-r1 b/metadata/md5-cache/app-crypt/gnupg-2.1.20-r1
index 7784a9e43233..e9328b616be2 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.1.20-r1
+++ b/metadata/md5-cache/app-crypt/gnupg-2.1.20-r1
@@ -4,10 +4,10 @@ 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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.20.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=a9105c0113c59a701a81499638b1e447
+_md5_=f26a69d425171f755c5809ced786313d
diff --git a/metadata/md5-cache/app-doc/pms-6_p20170429 b/metadata/md5-cache/app-doc/pms-6_p20170429
index 358a22175d3a..39cb09ea2ba9 100644
--- a/metadata/md5-cache/app-doc/pms-6_p20170429
+++ b/metadata/md5-cache/app-doc/pms-6_p20170429
@@ -4,8 +4,8 @@ DESCRIPTION=Gentoo Package Manager Specification
 EAPI=6
 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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~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_p20170429.tar.xz ) binary? ( https://dev.gentoo.org/~ulm/distfiles/pms-6_p20170429-prebuilt.tar.xz )
-_md5_=b2d2d72fffb9143aafb8f232778216f2
+_md5_=048bd4fcf3a4586c6a648b169a604d62
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r14 b/metadata/md5-cache/app-editors/emacs-23.4-r14
deleted file mode 100644
index 9916dd836f06..000000000000
--- a/metadata/md5-cache/app-editors/emacs-23.4-r14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=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 ) ) ) ) ) alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-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 ~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 )
-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
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=224ce5e2358da57c1b9f05f8caea8dd5
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r15 b/metadata/md5-cache/app-editors/emacs-23.4-r15
index c51edfacbe5d..059a4b8ee2e5 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r15
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r15
@@ -4,11 +4,11 @@ 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 ~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 )
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-20.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=36767bac95158a6fedd31890cede7bf4
+_md5_=34e2f171ab8fcb4a1ac9fc5547d13bd5
diff --git a/metadata/md5-cache/app-editors/emacs-25.2 b/metadata/md5-cache/app-editors/emacs-25.2
index c5194bcd27d3..ef93f69d5e12 100644
--- a/metadata/md5-cache/app-editors/emacs-25.2
+++ b/metadata/md5-cache/app-editors/emacs-25.2
@@ -4,11 +4,11 @@ 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 dynamic-loading 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 ~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:0= ) 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.2
 REQUIRED_USE=?? ( aqua X )
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.2.tar.xz
 _eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=569b645b24c2782cc7b38ce3250bd444
+_md5_=b6fd8706e5a3487cba883b64dcc676d4
diff --git a/metadata/md5-cache/app-editors/xvile-9.8r b/metadata/md5-cache/app-editors/xvile-9.8r
index 41d78a71932f..5e6cf2732037 100644
--- a/metadata/md5-cache/app-editors/xvile-9.8r
+++ b/metadata/md5-cache/app-editors/xvile-9.8r
@@ -4,9 +4,9 @@ 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
+KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8r >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4
 SLOT=0
 SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8r.tgz
-_md5_=0a78912d63af9e6f4fabc5215f54b33e
+_md5_=ccfaf48ff9063358e4c911ff6e4e64cd
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.5 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.5
deleted file mode 100644
index c34fa9820504..000000000000
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst setup
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Common files needed by all GNU Emacs versions
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-IUSE=games X
-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 ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+
-PDEPEND=virtual/emacs
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.5.tar.xz
-_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7e85bcd62652797d605a31796324eb13
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6
index c4b44a0f6ee8..2724386d211c 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Common files needed by all GNU Emacs versions
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
 IUSE=games X
-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 ~sparc-solaris ~x86-solaris
+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 ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+
 PDEPEND=virtual/emacs
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
 _eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ad696162cfbd564a04c42cf9476e2fc4
+_md5_=d5840440be2070964f621b0a9375be51
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.1 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.1
index dabcf24a1d9d..757113db008d 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.1
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=6
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=!<dev-db/postgresql-9.6.2-r1:9.6 !<dev-db/postgresql-9.5.6-r1:9.5 !<dev-db/postgresql-9.4.11-r1:9.4 !<dev-db/postgresql-9.3.16-r1:9.3 !<dev-db/postgresql-9.2.20-r1
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~titanofold/eselect-postgresql-2.1.tbz2
-_md5_=e5e4e182750675bd069176255bc66c8e
+_md5_=233bc0d104c248c29403381fa279b4d6
diff --git a/metadata/md5-cache/app-misc/bb-1.3.0_rc1-r4 b/metadata/md5-cache/app-misc/bb-1.3.0_rc1-r4
index 979ce38bb49b..c9491be9aa0e 100644
--- a/metadata/md5-cache/app-misc/bb-1.3.0_rc1-r4
+++ b/metadata/md5-cache/app-misc/bb-1.3.0_rc1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Demonstration program for visual effects of aalib
 EAPI=5
 HOMEPAGE=http://aa-project.sourceforge.net/
 IUSE=mikmod
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/aalib:= dev-libs/lzo:= mikmod? ( media-libs/libmikmod:=[openal] )
 SLOT=0
 SRC_URI=mirror://sourceforge/aa-project/bb-1.3rc1.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9e6c6d4c08ae220a972de48f40f3d0da
+_md5_=661547f0a3fafa7553aeb09228f97054
diff --git a/metadata/md5-cache/app-misc/tmux-2.3-r1 b/metadata/md5-cache/app-misc/tmux-2.3-r1
index 61e938830461..261fa94465fb 100644
--- a/metadata/md5-cache/app-misc/tmux-2.3-r1
+++ b/metadata/md5-cache/app-misc/tmux-2.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Terminal multiplexer
 EAPI=6
 HOMEPAGE=http://tmux.github.io/
 IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-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
+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
 LICENSE=ISC
 RDEPEND=dev-libs/libevent:0= || ( =dev-libs/libevent-2.0* >=dev-libs/libevent-2.1.5-r4 ) utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) sys-libs/ncurses:0= dev-libs/libevent:= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/tmux/tmux/releases/download/2.3/tmux-2.3.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4baa6e8d8cea6c6f6a33682a197e69ed
+_md5_=132a297630dd71fe8be76956e498ec70
diff --git a/metadata/md5-cache/app-office/dia-0.97.3 b/metadata/md5-cache/app-office/dia-0.97.3
index e5896ca03f9d..7820dd29b6eb 100644
--- a/metadata/md5-cache/app-office/dia-0.97.3
+++ b/metadata/md5-cache/app-office/dia-0.97.3
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/dia/0.97/dia-0.97.3.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e9ce9013b6669d3cfd90f380eef26522
+_md5_=9cdc6b8d0eeae3829f3e42698e0d5490
diff --git a/metadata/md5-cache/app-office/kexi-3.0.0 b/metadata/md5-cache/app-office/kexi-3.0.0
deleted file mode 100644
index 262207838eca..000000000000
--- a/metadata/md5-cache/app-office/kexi-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.34.0:5 >=kde-frameworks/kcodecs-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-db/kdb[mysql?,postgres?,sqlite?] dev-libs/kproperty dev-libs/kreport marble? ( >=kde-apps/marble-14.12.0:5 ) mdb? ( dev-libs/glib:2 ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.6.1:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Visual database applications creator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/
-IUSE=marble mdb mysql postgres sqlite webkit debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.34.0:5 >=kde-frameworks/kcodecs-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-db/kdb[mysql?,postgres?,sqlite?] dev-libs/kproperty dev-libs/kreport marble? ( >=kde-apps/marble-14.12.0:5 ) mdb? ( dev-libs/glib:2 ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.6.1:5 ) >=kde-frameworks/breeze-icons-rcc-5.34.0:5 !app-office/calligra:4[calligra_features_kexi] !app-office/calligra-l10n:4[calligra_features_kexi(+)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kexi/src/kexi-3.0.0.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	475744bd521894645f9df9ade627e4c1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=36fa659934363a5f40b88bde6a8a77c2
diff --git a/metadata/md5-cache/app-text/an-1.2-r1 b/metadata/md5-cache/app-text/an-1.2-r1
new file mode 100644
index 000000000000..dd0626facc34
--- /dev/null
+++ b/metadata/md5-cache/app-text/an-1.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/icu:=
+DESCRIPTION=Very fast anagram generator with dictionary lookup
+EAPI=6
+HOMEPAGE=http://packages.debian.org/unstable/games/an
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal]
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/an/an_1.2.orig.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=0774ab8b7ac4f020700fd4fcf75e77d2
diff --git a/metadata/md5-cache/app-text/dvipsk-5.996_p20160523 b/metadata/md5-cache/app-text/dvipsk-5.996_p20160523
index 37533ec23853..640e2bf6e2e6 100644
--- a/metadata/md5-cache/app-text/dvipsk-5.996_p20160523
+++ b/metadata/md5-cache/app-text/dvipsk-5.996_p20160523
@@ -4,10 +4,10 @@ DESCRIPTION=DVI-to-PostScript translator
 EAPI=4
 HOMEPAGE=http://tug.org/texlive/
 IUSE=doc source
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!<app-text/texlive-core-2010 !<dev-texlive/texlive-basic-2009 !app-text/ptex >=dev-libs/kpathsea-6.2.1
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz mirror://gentoo/texlive-module-dvips-2016.tar.xz doc? ( mirror://gentoo/texlive-module-dvips.doc-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=6f3de789e98bc6d4ccc4e9809973d4c2
+_md5_=081761746422fbab1a07dd58c1531190
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.21 b/metadata/md5-cache/app-text/ghostscript-gpl-9.21
new file mode 100644
index 000000000000..ba4e0ee3e367
--- /dev/null
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= media-libs/jbig2dec >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=sys-libs/zlib-1.2.7:= virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn ) tiff? ( >=media-libs/tiff-4.0.1:0= ) X? ( x11-libs/libXt x11-libs/libXext ) virtual/pkgconfig >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PDF
+EAPI=6
+HOMEPAGE=http://ghostscript.com/
+IUSE=cups dbus gtk l10n_de static-libs tiff unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=AGPL-3 CPL-1.0
+RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= media-libs/jbig2dec >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=sys-libs/zlib-1.2.7:= virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn ) tiff? ( >=media-libs/tiff-4.0.1:0= ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.5-r1 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other !<net-print/cups-filters-1.0.36-r2
+SLOT=0
+SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/ghostscript-9.21.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/ghostscript-gpl-9.21-patchset-1.tar.xz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=92b72eca26422a9afd126b9380028255
diff --git a/metadata/md5-cache/app-text/hunspell-1.6.1-r1 b/metadata/md5-cache/app-text/hunspell-1.6.1-r1
index da29aef51f5a..b2779cae5795 100644
--- a/metadata/md5-cache/app-text/hunspell-1.6.1-r1
+++ b/metadata/md5-cache/app-text/hunspell-1.6.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Hunspell spell checker - an improved replacement for myspell in OOo
 EAPI=6
 HOMEPAGE=http://hunspell.sourceforge.net/
 IUSE=ncurses nls readline static-libs l10n_af l10n_bg l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_km l10n_ku l10n_lt l10n_lv l10n_mi l10n_mk l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_sw l10n_tn l10n_uk l10n_zu
-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 ~x64-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 ~x64-solaris ~x86-solaris
 LICENSE=MPL-1.1 GPL-2 LGPL-2.1
 PDEPEND=app-dicts/myspell-en l10n_af? ( app-dicts/myspell-af ) l10n_bg? ( app-dicts/myspell-bg ) l10n_ca? ( app-dicts/myspell-ca ) l10n_cs? ( app-dicts/myspell-cs ) l10n_cy? ( app-dicts/myspell-cy ) l10n_da? ( app-dicts/myspell-da ) l10n_de? ( app-dicts/myspell-de ) l10n_de-1901? ( app-dicts/myspell-de_1901 ) l10n_el? ( app-dicts/myspell-el ) l10n_en? ( app-dicts/myspell-en ) l10n_eo? ( app-dicts/myspell-eo ) l10n_es? ( app-dicts/myspell-es ) l10n_et? ( app-dicts/myspell-et ) l10n_fo? ( app-dicts/myspell-fo ) l10n_fr? ( app-dicts/myspell-fr ) l10n_ga? ( app-dicts/myspell-ga ) l10n_gl? ( app-dicts/myspell-gl ) l10n_he? ( app-dicts/myspell-he ) l10n_hr? ( app-dicts/myspell-hr ) l10n_hu? ( app-dicts/myspell-hu ) l10n_ia? ( app-dicts/myspell-ia ) l10n_id? ( app-dicts/myspell-id ) l10n_is? ( app-dicts/myspell-is ) l10n_it? ( app-dicts/myspell-it ) l10n_km? ( app-dicts/myspell-km ) l10n_ku? ( app-dicts/myspell-ku ) l10n_lt? ( app-dicts/myspell-lt ) l10n_lv? ( app-dicts/myspell-lv ) l10n_mi? ( app-dicts/myspell-mi ) l10n_mk? ( app-dicts/myspell-mk ) l10n_ms? ( app-dicts/myspell-ms ) l10n_nb? ( app-dicts/myspell-nb ) l10n_nl? ( app-dicts/myspell-nl ) l10n_nn? ( app-dicts/myspell-nn ) l10n_pl? ( app-dicts/myspell-pl ) l10n_pt? ( app-dicts/myspell-pt ) l10n_pt-BR? ( app-dicts/myspell-pt-br ) l10n_ro? ( app-dicts/myspell-ro ) l10n_ru? ( app-dicts/myspell-ru ) l10n_sk? ( app-dicts/myspell-sk ) l10n_sl? ( app-dicts/myspell-sl ) l10n_sq? ( app-dicts/myspell-sq ) l10n_sv? ( app-dicts/myspell-sv ) l10n_sw? ( app-dicts/myspell-sw ) l10n_tn? ( app-dicts/myspell-tn ) l10n_uk? ( app-dicts/myspell-uk ) l10n_zu? ( app-dicts/myspell-zu )
 RDEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= )
 SLOT=0/1.6
 SRC_URI=https://github.com/hunspell/hunspell/archive/v1.6.1.tar.gz -> hunspell-1.6.1.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=bf3534278b4c0336c2c1fb5dbac6a7d8
+_md5_=37992015d4cf7ce1399333b7df69214b
diff --git a/metadata/md5-cache/app-text/mupdf-1.11-r1 b/metadata/md5-cache/app-text/mupdf-1.11-r1
index f313ae2464ed..2f6c27c3cb5f 100644
--- a/metadata/md5-cache/app-text/mupdf-1.11-r1
+++ b/metadata/md5-cache/app-text/mupdf-1.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
 EAPI=6
 HOMEPAGE=http://mupdf.com/
 IUSE=X +curl javascript libressl opengl +openssl static static-libs vanilla
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 RDEPEND=!libressl? ( dev-libs/openssl:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2[static-libs?] media-libs/harfbuzz[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/libpng:0[static-libs?] >=media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/glfw-3.2 )
 REQUIRED_USE=opengl? ( X !static !static-libs )
 SLOT=0/1.11
 SRC_URI=http://mupdf.com/downloads/mupdf-1.11-source.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=b4ff8fe45c59bee489afdafb2c24cc14
+_md5_=2f4558015be9ef1829ed26e56b815635
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r7 b/metadata/md5-cache/app-text/openjade-1.3.2-r7
index 82f14a24126d..f5977453acbf 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r7
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r7
@@ -4,10 +4,10 @@ DESCRIPTION=Jade is an implementation of DSSSL for formatting SGML and XML docum
 EAPI=5
 HOMEPAGE=http://openjade.sourceforge.net
 IUSE=static-libs
-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 ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	sgml-catalog	013e5c68335c5b4df8f1b72d7d7ad25d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=a87d282788185c84cc52c232dbde354e
+_md5_=e485d7a77e28da33ccc4e82301b7ac83
diff --git a/metadata/md5-cache/app-text/po4a-0.47-r1 b/metadata/md5-cache/app-text/po4a-0.47-r1
index 3ce857967489..2db158d4a64e 100644
--- a/metadata/md5-cache/app-text/po4a-0.47-r1
+++ b/metadata/md5-cache/app-text/po4a-0.47-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for helping translation of documentation
 EAPI=6
 HOMEPAGE=http://po4a.alioth.debian.org
 IUSE=test linguas_af linguas_ca linguas_cs linguas_da linguas_de linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_hr linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_sl linguas_sv linguas_uk linguas_vi linguas_zh_CN linguas_zh_HK
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/po4a/po4a_0.47.orig.tar.gz
 _eclasses_=l10n	8f52d9ce1814aca2ed1a46920084ea66	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=840d9c17f0381883391e36ba1fa96d94
+_md5_=d07439cb3ff1854599c98764e8753445
diff --git a/metadata/md5-cache/app-text/ps2pkm-1.8_p20160523 b/metadata/md5-cache/app-text/ps2pkm-1.8_p20160523
index 60481929d256..7d4f65be5c1d 100644
--- a/metadata/md5-cache/app-text/ps2pkm-1.8_p20160523
+++ b/metadata/md5-cache/app-text/ps2pkm-1.8_p20160523
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/kpathsea-6.2.1 virtual/pkgconfig
 DESCRIPTION=Tool that converts a PostScript type1 font into a corresponding TeX PK font
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<app-text/texlive-core-2010 !app-text/ptex >=dev-libs/kpathsea-6.2.1
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz
-_md5_=0159bf50859e057d759679319d7db5df
+_md5_=3cfbc754fcd779974f831d3a93e4f8b4
diff --git a/metadata/md5-cache/app-text/texlive-2016 b/metadata/md5-cache/app-text/texlive-2016
index bce38904125b..339fd914ee77 100644
--- a/metadata/md5-cache/app-text/texlive-2016
+++ b/metadata/md5-cache/app-text/texlive-2016
@@ -4,8 +4,8 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk context detex dvi2tty extra epspdf games graphics humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xindy xml X l10n_af l10n_ar l10n_as l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_en-GB l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_kn l10n_la l10n_lo l10n_lt l10n_lv l10n_ml l10n_mn l10n_mr l10n_nb l10n_nl l10n_nn l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_rm l10n_ro l10n_ru l10n_sa l10n_sco l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tk l10n_tr l10n_uk l10n_vi l10n_zh
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=metapackage
 RDEPEND=>=app-text/texlive-core-2016 app-text/psutils >=dev-texlive/texlive-fontutils-2016 media-gfx/sam2p texi2html? ( app-text/texi2html ) sys-apps/texinfo app-text/t1utils >=app-text/lcdf-typetools-2.92[kpathsea] truetype? ( >=app-text/ttf2pk2-2.0_p20150521 ) detex? ( dev-tex/detex ) app-text/ps2eps dvi2tty? ( dev-tex/dvi2tty ) png? ( app-text/dvipng ) X? ( >=app-text/xdvik-22.87 ) >=dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-fontsrecommended-2016 >=dev-texlive/texlive-latex-2016 luatex? ( >=dev-texlive/texlive-luatex-2016 ) >=dev-texlive/texlive-latexrecommended-2016 >=dev-tex/xcolor-2.11 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2016 dev-tex/feynmf ) >=dev-texlive/texlive-genericrecommended-2016 pdfannotextractor? ( dev-tex/pdfannotextractor ) extra? ( dev-tex/chktex app-text/dvisvgm dev-tex/latexdiff >=dev-tex/latexmk-418 >=app-text/pdfjam-2.02 >=dev-texlive/texlive-bibtexextra-2016 >=dev-texlive/texlive-fontsextra-2016 >=dev-texlive/texlive-formatsextra-2016 >=dev-texlive/texlive-genericextra-2016 >=dev-texlive/texlive-latexextra-2016 >=dev-tex/glossaries-2.07 >=dev-tex/leaflet-20041222 >=dev-tex/currvita-0.9i-r1 >=dev-tex/g-brief-4.0.2 >=dev-tex/envlab-1.2-r1 >=dev-tex/europecv-20060424-r1 >=dev-tex/svninfo-0.7.3-r1 >=dev-texlive/texlive-plainextra-2016 ) xetex? ( >=dev-texlive/texlive-xetex-2016 ) graphics? ( >=dev-texlive/texlive-pictures-2016 dev-tex/dot2texi ) epspdf? ( app-text/epspdf ) science? ( >=dev-texlive/texlive-mathscience-2016 ) publishers? ( >=dev-texlive/texlive-publishers-2016 ) music? ( >=dev-texlive/texlive-music-2016 ) pstricks? ( >=dev-texlive/texlive-pstricks-2016 ) omega? ( >=dev-texlive/texlive-omega-2016 ) context? ( >=dev-texlive/texlive-context-2016 ) games? ( >=dev-texlive/texlive-games-2016 ) humanities? ( >=dev-texlive/texlive-humanities-2016 ) tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 ) xml? ( >=dev-tex/xmltex-1.9-r2 app-text/passivetex ) jadetex? ( >=app-text/jadetex-3.13-r2 ) l10n_af? ( >=dev-texlive/texlive-langafrican-2016 >=dev-texlive/texlive-langother-2016 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2016 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2016 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2016 ) cjk? ( >=dev-texlive/texlive-langcjk-2016 >=dev-tex/cjk-latex-4.8.4 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2016 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2016 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2016 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2016 >=app-text/vlna-1.3 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2016 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2016 ) l10n_en-GB? ( >=dev-texlive/texlive-langenglish-2016 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2016 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2016 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2016 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2016 ) l10n_he? ( >=dev-texlive/texlive-langother-2016 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_as? ( >=dev-texlive/texlive-langindic-2016 ) l10n_bn? ( >=dev-texlive/texlive-langindic-2016 ) l10n_gu? ( >=dev-texlive/texlive-langindic-2016 ) l10n_hi? ( >=dev-texlive/texlive-langindic-2016 ) l10n_kn? ( >=dev-texlive/texlive-langindic-2016 ) l10n_ml? ( >=dev-texlive/texlive-langindic-2016 ) l10n_mr? ( >=dev-texlive/texlive-langindic-2016 ) l10n_or? ( >=dev-texlive/texlive-langindic-2016 ) l10n_pa? ( >=dev-texlive/texlive-langindic-2016 ) l10n_sa? ( >=dev-texlive/texlive-langindic-2016 ) l10n_ta? ( >=dev-texlive/texlive-langindic-2016 ) l10n_te? ( >=dev-texlive/texlive-langindic-2016 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2016 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2016 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2016 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2016 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_eo? ( >=dev-texlive/texlive-langother-2016 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2016 ) l10n_ia? ( >=dev-texlive/texlive-langother-2016 ) l10n_id? ( >=dev-texlive/texlive-langother-2016 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_lo? ( >=dev-texlive/texlive-langother-2016 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2016 >=dev-texlive/texlive-langcyrillic-2016 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2016 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2016 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2016 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2016 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2016 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2016 ) l10n_vi? ( >=dev-texlive/texlive-langother-2016 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2016 ) xindy? ( app-text/xindy )
 SLOT=0
-_md5_=de2520dd0d6d7d55f81878ff21ad34dd
+_md5_=65b545d47a2c7d0ced6ad4f7f0145bc7
diff --git a/metadata/md5-cache/app-text/texlive-core-2016-r5 b/metadata/md5-cache/app-text/texlive-core-2016-r5
index 0ca3ef233c61..34d4ed783f36 100644
--- a/metadata/md5-cache/app-text/texlive-core-2016-r5
+++ b/metadata/md5-cache/app-text/texlive-core-2016-r5
@@ -4,10 +4,10 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk X doc source tk +luajittex xetex
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0 xetex? ( >=media-libs/harfbuzz-0.9.20[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.1 cjk? ( >=dev-libs/ptexenc-1.3.4_p20160523 ) >=app-text/ps2pkm-1.8_p20160523 >=app-text/dvipsk-5.996_p20160523 >=dev-tex/bibtexu-3.71_p20160523 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz mirror://gentoo/texlive-core-patches-65.tar.xz mirror://gentoo/texlive-module-tetex-2016.tar.xz mirror://gentoo/texlive-module-hyphen-base-2016.tar.xz mirror://gentoo/texlive-module-texconfig-2016.tar.xz mirror://gentoo/texlive-module-gsftopk-2016.tar.xz mirror://gentoo/texlive-module-texlive.infra-2016.tar.xz mirror://gentoo/texlive-module-a2ping-2016.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2016.tar.xz mirror://gentoo/texlive-module-arara-2016.tar.xz mirror://gentoo/texlive-module-asymptote-2016.tar.xz mirror://gentoo/texlive-module-bundledoc-2016.tar.xz mirror://gentoo/texlive-module-checklistings-2016.tar.xz mirror://gentoo/texlive-module-ctan_chk-2016.tar.xz mirror://gentoo/texlive-module-ctanify-2016.tar.xz mirror://gentoo/texlive-module-ctanupload-2016.tar.xz mirror://gentoo/texlive-module-ctie-2016.tar.xz mirror://gentoo/texlive-module-cweb-2016.tar.xz mirror://gentoo/texlive-module-de-macro-2016.tar.xz mirror://gentoo/texlive-module-dtl-2016.tar.xz mirror://gentoo/texlive-module-dtxgen-2016.tar.xz mirror://gentoo/texlive-module-dvi2tty-2016.tar.xz mirror://gentoo/texlive-module-dviasm-2016.tar.xz mirror://gentoo/texlive-module-dvicopy-2016.tar.xz mirror://gentoo/texlive-module-dvidvi-2016.tar.xz mirror://gentoo/texlive-module-dviljk-2016.tar.xz mirror://gentoo/texlive-module-dvipos-2016.tar.xz mirror://gentoo/texlive-module-findhyph-2016.tar.xz mirror://gentoo/texlive-module-fragmaster-2016.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2016.tar.xz mirror://gentoo/texlive-module-hyphenex-2016.tar.xz mirror://gentoo/texlive-module-installfont-2016.tar.xz mirror://gentoo/texlive-module-lacheck-2016.tar.xz mirror://gentoo/texlive-module-latex-git-log-2016.tar.xz mirror://gentoo/texlive-module-latex-papersize-2016.tar.xz mirror://gentoo/texlive-module-latex2man-2016.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2016.tar.xz mirror://gentoo/texlive-module-latexfileversion-2016.tar.xz mirror://gentoo/texlive-module-latexpand-2016.tar.xz mirror://gentoo/texlive-module-latexindent-2016.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2016.tar.xz mirror://gentoo/texlive-module-ltximg-2016.tar.xz mirror://gentoo/texlive-module-listings-ext-2016.tar.xz mirror://gentoo/texlive-module-make4ht-2016.tar.xz mirror://gentoo/texlive-module-match_parens-2016.tar.xz mirror://gentoo/texlive-module-mflua-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2016.tar.xz mirror://gentoo/texlive-module-patgen-2016.tar.xz mirror://gentoo/texlive-module-pdfbook2-2016.tar.xz mirror://gentoo/texlive-module-pdfcrop-2016.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2016.tar.xz mirror://gentoo/texlive-module-pdftools-2016.tar.xz mirror://gentoo/texlive-module-pdfxup-2016.tar.xz mirror://gentoo/texlive-module-pfarrei-2016.tar.xz mirror://gentoo/texlive-module-pkfix-2016.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2016.tar.xz mirror://gentoo/texlive-module-purifyeps-2016.tar.xz mirror://gentoo/texlive-module-seetexk-2016.tar.xz mirror://gentoo/texlive-module-srcredact-2016.tar.xz mirror://gentoo/texlive-module-sty2dtx-2016.tar.xz mirror://gentoo/texlive-module-synctex-2016.tar.xz mirror://gentoo/texlive-module-tex4ebook-2016.tar.xz mirror://gentoo/texlive-module-texcount-2016.tar.xz mirror://gentoo/texlive-module-texdef-2016.tar.xz mirror://gentoo/texlive-module-texdiff-2016.tar.xz mirror://gentoo/texlive-module-texdirflatten-2016.tar.xz mirror://gentoo/texlive-module-texdoc-2016.tar.xz mirror://gentoo/texlive-module-texfot-2016.tar.xz mirror://gentoo/texlive-module-texliveonfly-2016.tar.xz mirror://gentoo/texlive-module-texloganalyser-2016.tar.xz mirror://gentoo/texlive-module-texosquery-2016.tar.xz mirror://gentoo/texlive-module-texware-2016.tar.xz mirror://gentoo/texlive-module-tie-2016.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2016.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2016.tar.xz mirror://gentoo/texlive-module-web-2016.tar.xz mirror://gentoo/texlive-module-collection-binextra-2016.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2016.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2016.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2016.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2016.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2016.tar.xz mirror://gentoo/texlive-module-arara.doc-2016.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2016.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2016.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2016.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2016.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2016.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2016.tar.xz mirror://gentoo/texlive-module-ctie.doc-2016.tar.xz mirror://gentoo/texlive-module-cweb.doc-2016.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2016.tar.xz mirror://gentoo/texlive-module-dtl.doc-2016.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2016.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2016.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2016.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2016.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2016.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2016.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2016.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2016.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2016.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2016.tar.xz mirror://gentoo/texlive-module-installfont.doc-2016.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2016.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2016.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2016.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2016.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2016.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2016.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2016.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2016.tar.xz mirror://gentoo/texlive-module-patgen.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2016.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2016.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2016.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2016.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2016.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2016.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2016.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2016.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2016.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2016.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2016.tar.xz mirror://gentoo/texlive-module-synctex.doc-2016.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2016.tar.xz mirror://gentoo/texlive-module-texcount.doc-2016.tar.xz mirror://gentoo/texlive-module-texdef.doc-2016.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2016.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2016.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-texfot.doc-2016.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2016.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2016.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2016.tar.xz mirror://gentoo/texlive-module-texware.doc-2016.tar.xz mirror://gentoo/texlive-module-tie.doc-2016.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2016.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-web.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2016.tar.xz mirror://gentoo/texlive-module-arara.source-2016.tar.xz mirror://gentoo/texlive-module-checklistings.source-2016.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2016.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2016.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2016.tar.xz mirror://gentoo/texlive-module-pythontex.source-2016.tar.xz mirror://gentoo/texlive-module-texdef.source-2016.tar.xz mirror://gentoo/texlive-module-texosquery.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=73a60660448a893c7d20b8750527b4cb
+_md5_=47b7f8f79ede0e8febec607d6c7e109d
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r1 b/metadata/md5-cache/app-text/texlive-core-2017-r1
index 16bfae8ac334..55246c1cc320 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r1
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0 xetex? ( >=media-libs/harfbuzz-0.9.20[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.1 cjk? ( >=dev-libs/ptexenc-1.3.4_p20160523 ) virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils >=app-portage/elt-patches-20170317
+DEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0 xetex? ( >=media-libs/harfbuzz-0.9.20[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils >=app-portage/elt-patches-20170317
 DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk X doc source tk +luajittex xetex
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
-RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0 xetex? ( >=media-libs/harfbuzz-0.9.20[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.1 cjk? ( >=dev-libs/ptexenc-1.3.4_p20160523 ) >=app-text/ps2pkm-1.8_p20160523 >=app-text/dvipsk-5.996_p20160523 >=dev-tex/bibtexu-3.71_p20160523 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
+RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0 xetex? ( >=media-libs/harfbuzz-0.9.20[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-67.tar.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=29a7fee80b137095d160016e825daabe
+_md5_=a434aad70cc3819653f5bc6a3668fefe
diff --git a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20160523 b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20160523
index c31e47566c67..d0058d8e028f 100644
--- a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20160523
+++ b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20160523
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs
 DESCRIPTION=Freetype 2 based TrueType font to TeX's PK format converter
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source]
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz
-_md5_=316097f07d7bf2be1e542487e974a6a6
+_md5_=d953f9b76cc7342478765dc30738bb57
diff --git a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6 b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
index d99fdec99d94..f79e3ad8048f 100644
--- a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
+++ b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, full-featured text search engine based off of luce
 EAPI=6
 HOMEPAGE=http://clucene.sourceforge.net/
 IUSE=debug doc static-libs
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://sourceforge/clucene/clucene-core-2.3.3.4.tar.gz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=14120ff980b9f9b0c4d5091fc9238255
+_md5_=92f769dbbed15e3b769e7489384a9ec9
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1 b/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1
index 02bfa7d053ab..dde54dcf3fbd 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Google C++ Testing Framework
 EAPI=5
 HOMEPAGE=https://github.com/google/googletest
 IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+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
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://googletest.googlecode.com/files/gtest-1.7.0.zip
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=86324f74dc0994770cff887a140e2561
+_md5_=f1fa90e5ec2030b22716e43118f5932b
diff --git a/metadata/md5-cache/dev-db/freetds-1.00.41 b/metadata/md5-cache/dev-db/freetds-1.00.41
index 0020fd674ba4..2c2d0198ee04 100644
--- a/metadata/md5-cache/dev-db/freetds-1.00.41
+++ b/metadata/md5-cache/dev-db/freetds-1.00.41
@@ -4,11 +4,11 @@ DESCRIPTION=Tabular Datastream Library
 EAPI=6
 HOMEPAGE=http://www.freetds.org/
 IUSE=gnutls iconv kerberos libressl mssql iodbc odbc ssl
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=gnutls? ( net-libs/gnutls ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) net-dns/bind-tools sys-apps/grep sys-apps/sed virtual/awk
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.00.41.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=b904df5f3609e357e3c8d294872d6f1c
+_md5_=da72e702d1a099853e35d5dca77fc1ba
diff --git a/metadata/md5-cache/dev-db/myodbc-5.2.7-r1 b/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
index 8fafd0d475b9..d7696cec939e 100644
--- a/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
+++ b/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
@@ -11,4 +11,4 @@ RESTRICT=primaryuri
 SLOT=5.2
 SRC_URI=mirror://mysql/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-5.2.7-src.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3dcb52fc39327e6a7d9d439acf2a2d22
+_md5_=4e06498140a4e9703b9da27c2126c88e
diff --git a/metadata/md5-cache/dev-db/myodbc-5.2.7-r2 b/metadata/md5-cache/dev-db/myodbc-5.2.7-r2
index 84ba861553ba..fc27028ff977 100644
--- a/metadata/md5-cache/dev-db/myodbc-5.2.7-r2
+++ b/metadata/md5-cache/dev-db/myodbc-5.2.7-r2
@@ -11,4 +11,4 @@ RESTRICT=primaryuri
 SLOT=5.2
 SRC_URI=mirror://mysql/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-5.2.7-src.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=bbb1af67d952a565b39e3acb0e28cce4
+_md5_=e9cb8a63cb94e716f1ef7578905dead9
diff --git a/metadata/md5-cache/dev-db/myodbc-5.3.8 b/metadata/md5-cache/dev-db/myodbc-5.3.8
new file mode 100644
index 000000000000..310d12f59537
--- /dev/null
+++ b/metadata/md5-cache/dev-db/myodbc-5.3.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~virtual/libmysqlclient-18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql-connector-c sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=ODBC driver for MySQL
+EAPI=6
+HOMEPAGE=http://www.mysql.com/products/myodbc/
+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=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~virtual/libmysqlclient-18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql-connector-c
+SLOT=5.3
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-ODBC/5.3/mysql-connector-odbc-5.3.8-src.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=524dd78e191259f984b6e6bbac2e553c
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.21 b/metadata/md5-cache/dev-db/postgresql-9.2.21
index 390e8c37d3b9..75c444072705 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.2.21
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.21
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.21/postgresql-9.2.21.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	df8265631f8bf5f5df387e9b987121f9	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4779daaf2ed86f6d5dd8c64ebaf5c4db
+_md5_=5b3278f9714cc1fdef90ac14cac65ee5
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.17 b/metadata/md5-cache/dev-db/postgresql-9.3.17
index 5f68b5be299f..55f6bab6f070 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.17
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.17
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3.17/postgresql-9.3.17.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	df8265631f8bf5f5df387e9b987121f9	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c6aa79c209ec1a4fe3c6d049c018548e
+_md5_=07097e506ec81c681fc3e8209e4e7c00
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.12 b/metadata/md5-cache/dev-db/postgresql-9.4.12
index 4c950db0f893..57e7828f2cf8 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.12
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.12
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.12/postgresql-9.4.12.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	df8265631f8bf5f5df387e9b987121f9	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6611d85ebacee39f732961689ee42abb
+_md5_=8d6a4e49608d916b3cb24011b76b1282
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.7 b/metadata/md5-cache/dev-db/postgresql-9.5.7
index daf7a319778f..2d4baa3ff50a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.7
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.7
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.7/postgresql-9.5.7.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	df8265631f8bf5f5df387e9b987121f9	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=77107d091372e6181954533e6b12ecdd
+_md5_=b515b05d689751f58b58ac1d0232464a
diff --git a/metadata/md5-cache/dev-db/sqlite-3.17.0 b/metadata/md5-cache/dev-db/sqlite-3.17.0
index a397d60863e2..814306106d10 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.17.0
+++ b/metadata/md5-cache/dev-db/sqlite-3.17.0
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=6
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=3
 SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3170000.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3170000.zip ) test? ( https://sqlite.org/2017/sqlite-src-3170000.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3170000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3170000.tar.gz ) ) )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=46a17c0f366a723ac83403c2397fd100
+_md5_=8c480d29e5ebe48055162cea82d5030d
diff --git a/metadata/md5-cache/dev-lang/mujs-0_p20161202 b/metadata/md5-cache/dev-lang/mujs-0_p20161202
index 70732e095960..71c0b4f488a4 100644
--- a/metadata/md5-cache/dev-lang/mujs-0_p20161202
+++ b/metadata/md5-cache/dev-lang/mujs-0_p20161202
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=lightweight Javascript interpreter
 EAPI=6
 HOMEPAGE=http://mujs.com/
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 SLOT=0
 SRC_URI=http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=fd003eceda531e13fbdd1aeb6e9c73156496e569;sf=tgz -> mujs-0_p20161202.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=5dcdc4f7dc9bfa442e494e5e28e0236d
+_md5_=0e9c4a720965b47ee82b4a89b6128a9e
diff --git a/metadata/md5-cache/dev-lang/perl-5.24.1-r2 b/metadata/md5-cache/dev-lang/perl-5.24.1-r2
index 7c2eb13c605f..e20ac629f624 100644
--- a/metadata/md5-cache/dev-lang/perl-5.24.1-r2
+++ b/metadata/md5-cache/dev-lang/perl-5.24.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=6
 HOMEPAGE=http://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Path-2.130.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.24
 SRC_URI=mirror://cpan/src/5.0/perl-5.24.1.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.24.1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.24.1-patches-3/perl-5.24.1-patches-3.tar.xz mirror://gentoo/perl-5.24.1-patches-3.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.24.1-patches-3.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.4/perl-cross-1.1.4.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=cb405359dd2ac50e7347662399cd0815
+_md5_=c3f0aa24f2c1e720bd38b60cba9ba562
diff --git a/metadata/md5-cache/dev-lang/php-7.0.19 b/metadata/md5-cache/dev-lang/php-7.0.19
index 01a0f0e44daf..a67c7e5fa320 100644
--- a/metadata/md5-cache/dev-lang/php-7.0.19
+++ b/metadata/md5-cache/dev-lang/php-7.0.19
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=http://php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-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
+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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) || ( cli cgi fpm apache2 embed phpdbg )
 SLOT=7.0
 SRC_URI=http://php.net/distributions/php-7.0.19.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c7dce19c6d30501a511507562b0ea195
+_md5_=843c27e8e23ada305f75b09151556277
diff --git a/metadata/md5-cache/dev-lang/swig-3.0.12 b/metadata/md5-cache/dev-lang/swig-3.0.12
index 0538ffa6f163..ceea005413b6 100644
--- a/metadata/md5-cache/dev-lang/swig-3.0.12
+++ b/metadata/md5-cache/dev-lang/swig-3.0.12
@@ -4,10 +4,10 @@ DESCRIPTION=Simplified Wrapper and Interface Generator
 EAPI=6
 HOMEPAGE=http://www.swig.org/
 IUSE=ccache doc pcre
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+ BSD BSD-2
 RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/swig/swig-3.0.12.tar.gz
-_md5_=abaae32a4b8b3990a52c4abe29fed452
+_md5_=8c68fd67eca0e1de3de20fe6f0d11a50
diff --git a/metadata/md5-cache/dev-libs/botan-1.10.16 b/metadata/md5-cache/dev-libs/botan-1.10.16
index 69d1471d9ced..d31fd17df3af 100644
--- a/metadata/md5-cache/dev-libs/botan-1.10.16
+++ b/metadata/md5-cache/dev-libs/botan-1.10.16
@@ -4,11 +4,11 @@ DESCRIPTION=A C++ crypto library
 EAPI=6
 HOMEPAGE=http://botan.randombit.net/
 IUSE=bindist doc python bzip2 gmp libressl ssl static-libs threads zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~ppc-macos
 LICENSE=BSD
 RDEPEND=bzip2? ( >=app-arch/bzip2-1.0.5 ) zlib? ( >=sys-libs/zlib-1.2.3 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/boost-1.48[python,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(-)] ) gmp? ( >=dev-libs/gmp-4.2.2:* ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=http://botan.randombit.net/releases/Botan-1.10.16.tgz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=bd95cec0d155f696e5feb15c66285993
+_md5_=bb4c3faff84dd63628d49336b221dfe3
diff --git a/metadata/md5-cache/dev-libs/crypto++-5.6.5-r1 b/metadata/md5-cache/dev-libs/crypto++-5.6.5-r1
index 32ec07325191..9d001fbcb5f7 100644
--- a/metadata/md5-cache/dev-libs/crypto++-5.6.5-r1
+++ b/metadata/md5-cache/dev-libs/crypto++-5.6.5-r1
@@ -4,9 +4,9 @@ DESCRIPTION=C++ class library of cryptographic schemes
 EAPI=6
 HOMEPAGE=http://cryptopp.com
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~x64-macos
 LICENSE=Boost-1.0
 SLOT=0/5.6
 SRC_URI=https://www.cryptopp.com/cryptopp565.zip
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=624f61380c14617d0dfe35cce890b1c9
+_md5_=16c5e8e2ea01d511bf757f44d15460bb
diff --git a/metadata/md5-cache/dev-libs/icu-58.2-r1 b/metadata/md5-cache/dev-libs/icu-58.2-r1
index 571fd8578841..0838fca00330 100644
--- a/metadata/md5-cache/dev-libs/icu-58.2-r1
+++ b/metadata/md5-cache/dev-libs/icu-58.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=International Components for Unicode
 EAPI=6
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0/58.2
 SRC_URI=http://download.icu-project.org/files/icu4c/58.2/icu4c-58_2-src.tgz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=83e081a5b1781c3b0950d63a25e4a90b
+_md5_=69c484ccb5e8ae37c5a48b8b748788a8
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-58.2 b/metadata/md5-cache/dev-libs/icu-layoutex-58.2
index 3f0252e3cbd8..1e37797a873c 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-58.2
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-58.2
@@ -4,10 +4,10 @@ DESCRIPTION=External layout part of International Components for Unicode
 EAPI=6
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ~hppa ia64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=~dev-libs/icu-58.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(-)?] dev-libs/icu-le-hb[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/58.2
 SRC_URI=http://download.icu-project.org/files/icu4c/58.2/icu4c-58_2-src.tgz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4e7956c130097792d70fa00853f2760c
+_md5_=f50552b6181df27c6994077d5574af46
diff --git a/metadata/md5-cache/dev-libs/libburn-1.4.6 b/metadata/md5-cache/dev-libs/libburn-1.4.6
index a5d728a2da9f..91bafff228bb 100644
--- a/metadata/md5-cache/dev-libs/libburn-1.4.6
+++ b/metadata/md5-cache/dev-libs/libburn-1.4.6
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source library for reading, mastering and writing optical discs
 EAPI=6
 HOMEPAGE=http://libburnia-project.org
 IUSE=cdio debug static-libs track-src-odirect
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=cdio? ( >=dev-libs/libcdio-0.83 )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libburn-1.4.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4d0c55cfd6bdb6b2d37b0172bf81c8db
+_md5_=557217c11d053b9bb42beb6e1345f624
diff --git a/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1 b/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
index dd8c8de4ef1f..441bdf959787 100644
--- a/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
+++ b/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/libcroco/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0.6
 SRC_URI=mirror://gnome/sources/libcroco/0.6/libcroco-0.6.12.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b041ddc6980f374981642a4e579c6004
+_md5_=abe5cf75ff1bd8511c189cc17484f118
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.5.7 b/metadata/md5-cache/dev-libs/libevdev-1.5.7
index 9d9dd7897a5e..65bc8c96fddf 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.5.7
+++ b/metadata/md5-cache/dev-libs/libevdev-1.5.7
@@ -4,11 +4,11 @@ DESCRIPTION=Handler library for evdev events
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 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 static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.5.7.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xorg-2	85b1e64779a3286b1224aef7dcfbca28
-_md5_=da9cde4a318899da4f3c5ff101b5e4ab
+_md5_=739695ef0b6dcb005bb8827f93cbe416
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.7.7 b/metadata/md5-cache/dev-libs/libgcrypt-1.7.7
index 28ffc9e3dc95..7fb2b15e1441 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.7.7
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.7.7
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~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
+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=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.7.7.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=bde7e0db3854e793cb21faa011955d5e
+_md5_=e490b46fc05a9aefb6fd0dbae32d9889
diff --git a/metadata/md5-cache/dev-libs/libical-2.0.0-r2 b/metadata/md5-cache/dev-libs/libical-2.0.0-r2
index 53062e5bc532..6888fa4fcc02 100644
--- a/metadata/md5-cache/dev-libs/libical-2.0.0-r2
+++ b/metadata/md5-cache/dev-libs/libical-2.0.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=An implementation of basic iCAL protocols
 EAPI=6
 HOMEPAGE=https://github.com/libical/libical
 IUSE=doc examples static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( MPL-1.0 LGPL-2.1 )
 RDEPEND=dev-libs/icu:=
 SLOT=0/2
 SRC_URI=https://github.com/libical/libical/archive/v2.0.0.tar.gz -> libical-2.0.0.tar.gz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=486097bf13b617f7c8c4f7f8a4633f5c
+_md5_=a6179153b76901bddbe3f7d949bfa6c0
diff --git a/metadata/md5-cache/dev-libs/libinput-1.7.2 b/metadata/md5-cache/dev-libs/libinput-1.7.2
index f5bdbcc8f542..2ab36895957f 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.7.2
+++ b/metadata/md5-cache/dev-libs/libinput-1.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
 IUSE=input_devices_wacom test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-0.4 >=sys-libs/mtdev-1.1 virtual/libudev
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.7.2.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=b41ebe7cd429854cd433c26a8d4b4631
+_md5_=3496a59a2745ce496cab8ec60ac0defd
diff --git a/metadata/md5-cache/dev-libs/libisoburn-1.4.6 b/metadata/md5-cache/dev-libs/libisoburn-1.4.6
index e316d75d3636..f25d283c5edb 100644
--- a/metadata/md5-cache/dev-libs/libisoburn-1.4.6
+++ b/metadata/md5-cache/dev-libs/libisoburn-1.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=Creation/expansion of ISO-9660 filesystems on CD/DVD media supported
 EAPI=6
 HOMEPAGE=http://libburnia-project.org/
 IUSE=acl cdio debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ppc ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=>=dev-libs/libburn-1.4.6 >=dev-libs/libisofs-1.4.6 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) cdio? ( >=dev-libs/libcdio-0.83 ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
 REQUIRED_USE=frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisoburn-1.4.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=8c1224d01ea14a66e2877345f617c6ac
+_md5_=db1c15bfa9755b9905f26d5c3df02889
diff --git a/metadata/md5-cache/dev-libs/libisofs-1.4.6 b/metadata/md5-cache/dev-libs/libisofs-1.4.6
index 4be132fccc9a..25c89d352507 100644
--- a/metadata/md5-cache/dev-libs/libisofs-1.4.6
+++ b/metadata/md5-cache/dev-libs/libisofs-1.4.6
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source library for reading, mastering and writing optical discs
 EAPI=6
 HOMEPAGE=http://libburnia-project.org/
 IUSE=acl debug static-libs verbose-debug xattr zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisofs-1.4.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=584cb46a31a51645e0145e1f36f136a1
+_md5_=ef0b899e4baa5e1f8a61382ba97dd76d
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.4 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.4
index d4e3ca519a1e..d27faf44d9f6 100644
--- a/metadata/md5-cache/dev-libs/libpthread-stubs-0.4
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Pthread functions stubs for platforms missing them
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 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 static-libs
-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
+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=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xorg-2	85b1e64779a3286b1224aef7dcfbca28
-_md5_=d735bb7b87d2e38939215c5c0f9052ed
+_md5_=72de1d3d3a8ec96504f74c17915b481e
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.10-r2 b/metadata/md5-cache/dev-libs/libtasn1-4.10-r2
index 436f9fd60bd2..0be1a6636713 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.10-r2
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.10-r2
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs valgrind 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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-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 LGPL-2.1
 RDEPEND=valgrind? ( dev-util/valgrind ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.10.tar.gz
 _eclasses_=libtool	e32ea84bf82cf8987965b574672dba93	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=1f3344d1e8b35f2ea2e56a6528d2e921
+_md5_=189526330f6fdfa290a25d0db0f47bce
diff --git a/metadata/md5-cache/dev-libs/nettle-3.3-r1 b/metadata/md5-cache/dev-libs/nettle-3.3-r1
index f797efaa20d7..907403681a23 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.3-r1
+++ b/metadata/md5-cache/dev-libs/nettle-3.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level cryptographic library
 EAPI=6
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
 IUSE=doc +gmp neon static-libs test cpu_flags_x86_aes abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( >=dev-libs/gmp-5.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r17 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6.1
 SRC_URI=mirror://gnu/nettle/nettle-3.3.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=6caf8b1249a5952475d928e992d145c3
+_md5_=41be1303b5388cfdfb1e1c97033ad56c
diff --git a/metadata/md5-cache/dev-libs/nss-3.29.5 b/metadata/md5-cache/dev-libs/nss-3.29.5
index b8c5253d87ac..e69a56642d59 100644
--- a/metadata/md5-cache/dev-libs/nss-3.29.5
+++ b/metadata/md5-cache/dev-libs/nss-3.29.5
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=6
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.13.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_29_5_RTM/src/nss-3.29.5.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=2a6b530d5d564dceb150414d74f28b06
+_md5_=5e8aab55b31eb853b9befd5acf8c3a2e
diff --git a/metadata/md5-cache/dev-libs/wayland-1.13.0 b/metadata/md5-cache/dev-libs/wayland-1.13.0
index 730465d855e6..4ec53dbed620 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.13.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=Wayland protocol libraries
 EAPI=6
 HOMEPAGE=https://wayland.freedesktop.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:=
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.13.0.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=f5f4e01615e8f82f76d18000625835fa
+_md5_=e86413102be7657b00633a5c2f06278e
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1
index 9f4e4adfc819..d0d3f9c15242 100644
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweigt RPC library based on XML and HTTP
 EAPI=6
 HOMEPAGE=http://xmlrpc-c.sourceforge.net/
 IUSE=abyss +cgi +curl +cxx +libxml2 threads test tools
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= curl? ( net-misc/curl ) libxml2? ( dev-libs/libxml2 )
 REQUIRED_USE=test? ( abyss curl cxx ) tools? ( curl )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.39.11.tgz
-_md5_=66a51125f8d5bbc901444201ab01d310
+_md5_=88921c8d5d145008280ac55d487b4937
diff --git a/metadata/md5-cache/dev-lisp/abcl-0.20.0-r1 b/metadata/md5-cache/dev-lisp/abcl-0.20.0-r1
new file mode 100644
index 000000000000..6b2a62fcd24d
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/abcl-0.20.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Common Lisp implementation for the JVM
+EAPI=6
+HOMEPAGE=http://common-lisp.net/project/armedbear/
+IUSE=elibc_FreeBSD doc elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=http://common-lisp.net/project/armedbear/releases/abcl-src-0.20.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=069e7314226c6bcf48acbd6554284c70
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.0.0 b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.0.0-r1
similarity index 100%
rename from metadata/md5-cache/dev-ml/ocaml-cstruct-3.0.0
rename to metadata/md5-cache/dev-ml/ocaml-cstruct-3.0.0-r1
diff --git a/metadata/md5-cache/dev-perl/Archive-Zip-1.590.0 b/metadata/md5-cache/dev-perl/Archive-Zip-1.590.0
index 6d3184c269f8..752da323573e 100644
--- a/metadata/md5-cache/dev-perl/Archive-Zip-1.590.0
+++ b/metadata/md5-cache/dev-perl/Archive-Zip-1.590.0
@@ -4,10 +4,10 @@ DESCRIPTION=A wrapper that lets you read Zip archive members as if they were fil
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Archive-Zip/
 IUSE=test examples
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.17.0 virtual/perl-File-Path >=virtual/perl-File-Spec-0.800.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.59.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=91af6f00a56595fe94274efd7f16a98a
+_md5_=c56f94075706ca5b16c29ddd1dd81d25
diff --git a/metadata/md5-cache/dev-perl/BSD-Resource-1.291.100 b/metadata/md5-cache/dev-perl/BSD-Resource-1.291.100
index a33361e1ba7f..0cd9d01c7d7e 100644
--- a/metadata/md5-cache/dev-perl/BSD-Resource-1.291.100
+++ b/metadata/md5-cache/dev-perl/BSD-Resource-1.291.100
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Perl module for BSD process resource limit and priority functions
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/BSD-Resource/
-KEYWORDS=alpha amd64 ~ia64 ~ppc sparc x86
+KEYWORDS=alpha amd64 ia64 ~ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=0ba51494e3c6b5ec35579fc5cb988d33
+_md5_=b594762742a6769a7e295ec82886a536
diff --git a/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0 b/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0
index 851baf5f27d6..1219fd32a671 100644
--- a/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0
+++ b/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=Report errors from perspective of caller of a clan of modules
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Carp-Clan/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Carp-Clan-6.06.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=eb308ae3e2585844b3e2fa77e55c81b2
+_md5_=fc88fe1e4c03d45bc17f9da527f9ac8f
diff --git a/metadata/md5-cache/dev-perl/Class-C3-XS-0.140.0 b/metadata/md5-cache/dev-perl/Class-C3-XS-0.140.0
index ccfc219e592a..19fd091aa98f 100644
--- a/metadata/md5-cache/dev-perl/Class-C3-XS-0.140.0
+++ b/metadata/md5-cache/dev-perl/Class-C3-XS-0.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=XS speedups for Class::C3
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-C3-XS/
 IUSE=test
-KEYWORDS=amd64 ~ia64 ppc sparc x86 ~x86-solaris
+KEYWORDS=amd64 ia64 ppc sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-C3-XS-0.14.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=12aa5290923960c45d49ddf4288789c1
+_md5_=83a2d8c49fd0c6cc69e48dd8214cd94a
diff --git a/metadata/md5-cache/dev-perl/Clone-0.390.0 b/metadata/md5-cache/dev-perl/Clone-0.390.0
index 58be9f46de61..a86001b0ab96 100644
--- a/metadata/md5-cache/dev-perl/Clone-0.390.0
+++ b/metadata/md5-cache/dev-perl/Clone-0.390.0
@@ -4,10 +4,10 @@ DESCRIPTION=Recursively copy Perl datatypes
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Clone/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Clone-0.39.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=67d90edf9f46b2cae3aef88dc2b375c5
+_md5_=8e2dfbf2f55812210f93c4e8eef1b06e
diff --git a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0 b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
index 0ec856881f4f..81c435f4eaef 100644
--- a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
+++ b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
@@ -4,10 +4,10 @@ DESCRIPTION=Interface to Bzip2 compression library
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Compress-Bzip2/
 IUSE=test
-KEYWORDS=amd64 ~ia64 ~mips sparc x86 ~ppc-aix
+KEYWORDS=amd64 ia64 ~mips sparc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-arch/bzip2 virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=58ce3e6c5136a5583357e891394ca710
+_md5_=8f7a22bc949ab1e90533d71d44342c1d
diff --git a/metadata/md5-cache/dev-perl/Curses-1.360.0 b/metadata/md5-cache/dev-perl/Curses-1.360.0
index d0fc07a22878..44070711b81f 100644
--- a/metadata/md5-cache/dev-perl/Curses-1.360.0
+++ b/metadata/md5-cache/dev-perl/Curses-1.360.0
@@ -4,10 +4,10 @@ DESCRIPTION=Curses interface modules for Perl
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Curses/
 IUSE=+unicode test examples
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/ncurses-5:0=[unicode?] virtual/perl-Data-Dumper dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.36.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=aee028c11ee4807608d7f7eabe2a0495
+_md5_=6f5a0db96bd4b972206e8c662da72e98
diff --git a/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0 b/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0
index 4fab7254d53c..43c8b4ea87f6 100644
--- a/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0
+++ b/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0
@@ -4,10 +4,10 @@ DESCRIPTION=Dump symbol names or the symbol table
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Devel-Symdump/
 IUSE=test
-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 ~x86-macos ~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 ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/Devel-Symdump-2.18.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=51cdb324d9c11e531e01ae732b831a64
+_md5_=fe24eb3899662a5b65539ee2eb729ebc
diff --git a/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0 b/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
index b60517dbba0b..78ae163ea7bc 100644
--- a/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
+++ b/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Get home directory for self or other user
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/File-HomeDir/
 IUSE=+xdg test
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-File-Path-2.10.0 >=virtual/perl-File-Spec-3 >=virtual/perl-File-Temp-0.190.0 >=dev-perl/File-Which-0.50.0 xdg? ( x11-misc/xdg-user-dirs ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.002.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=e2abd5d35ede0a027f1ec9c72059a441
+_md5_=94333930a5be5a74834a3a0d98c47025
diff --git a/metadata/md5-cache/dev-perl/File-Remove-1.570.0 b/metadata/md5-cache/dev-perl/File-Remove-1.570.0
index 8c8fd5aa2759..f779effaef60 100644
--- a/metadata/md5-cache/dev-perl/File-Remove-1.570.0
+++ b/metadata/md5-cache/dev-perl/File-Remove-1.570.0
@@ -4,10 +4,10 @@ DESCRIPTION=Remove files and directories
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/File-Remove/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-3.290.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.57.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9f7f156dede21c8c7baceab86ec94ee6
+_md5_=6447f27d158f5b1152c615b9016c098f
diff --git a/metadata/md5-cache/dev-perl/Filter-1.570.0 b/metadata/md5-cache/dev-perl/Filter-1.570.0
index cd65212a1e00..41098b866737 100644
--- a/metadata/md5-cache/dev-perl/Filter-1.570.0
+++ b/metadata/md5-cache/dev-perl/Filter-1.570.0
@@ -4,10 +4,10 @@ DESCRIPTION=Interface for creation of Perl Filters
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Filter/
 IUSE=examples
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.57.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=1e65570fb7cc46f4ef43dfa07073a405
+_md5_=9660556b28fd21fd18430325cbad8d04
diff --git a/metadata/md5-cache/dev-perl/Gtk2-1.249.920 b/metadata/md5-cache/dev-perl/Gtk2-1.249.920
index ada5e44817ed..ffab7b595dc9 100644
--- a/metadata/md5-cache/dev-perl/Gtk2-1.249.920
+++ b/metadata/md5-cache/dev-perl/Gtk2-1.249.920
@@ -4,10 +4,10 @@ DESCRIPTION=Perl bindings for GTK2
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Gtk2/
 IUSE=test test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gtk+:2 >=dev-perl/Cairo-1 >=dev-perl/glib-perl-1.280.0 >=dev-perl/Pango-1.220.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24992.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=cca55ce57317cd39121272839e321490
+_md5_=f5a77b6f463c04ec6cf1cbe67c64e7a7
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0
index 25458d47dc78..d0c2da2c7382 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provide the missing functionality from List::Util
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/List-MoreUtils/
 IUSE=test +xs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 PDEPEND=xs? ( dev-perl/List-MoreUtils-XS )
 RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.418.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=467a49c5300d9352421df2c399529610
+_md5_=294d9561e74aa1fd29119ce13f28e2e0
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0
index 83bee3784970..c10d0a54f02b 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compiled List::MoreUtils functions
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/List-MoreUtils-XS/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/List-MoreUtils-0.417.1 >=virtual/perl-XSLoader-0.220.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.418.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=71709b8c8f30e4973da9ef5202e34ed8
+_md5_=c3fc43c8946838207af0f380da8df027
diff --git a/metadata/md5-cache/dev-perl/Module-ScanDeps-1.230.0 b/metadata/md5-cache/dev-perl/Module-ScanDeps-1.230.0
index 6e1723719807..3d603d3426da 100644
--- a/metadata/md5-cache/dev-perl/Module-ScanDeps-1.230.0
+++ b/metadata/md5-cache/dev-perl/Module-ScanDeps-1.230.0
@@ -4,10 +4,10 @@ DESCRIPTION=Recursively scan Perl code for dependencies
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Module-ScanDeps/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-Module-Metadata virtual/perl-Text-ParseWords virtual/perl-version dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.23.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=40dd9b752dea1437a43f1e8d18066ff7
+_md5_=4b97692eee8807bec808dfaed5c45384
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.810.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.810.0
index 8b739073e329..870176baf5fb 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.810.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.810.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for using OpenSSL
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-SSLeay/
 IUSE=libressl test minimal examples examples
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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=openssl
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.81.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=951e683ebf98f2ce98c0ffba06fc5c26
+_md5_=38c01083138036005504dc1edb2ed61d
diff --git a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15 b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
index fcfc6ff9f7f2..0c08302705b3 100644
--- a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
+++ b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
@@ -4,10 +4,10 @@ DESCRIPTION=Generate Recursive-Descent Parsers
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Parse-RecDescent/
 IUSE=test examples
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Text-Balanced-1.950.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=2a6c68bec726a683f07f04d6dc4b5680
+_md5_=40e3819e16c1f0c3839856048780fa35
diff --git a/metadata/md5-cache/dev-perl/SUPER-1.201.411.170 b/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
index 4bcd7dcb8fca..de0d5b7423e7 100644
--- a/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
+++ b/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
@@ -4,10 +4,10 @@ DESCRIPTION=control superclass method dispatch
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/SUPER/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=7048166ab4d0e5f4be36f91341d67767
+_md5_=8936caa3492b7a543de42969b39bbcc9
diff --git a/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0 b/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0
index 11cf9339d360..3643bb120b81 100644
--- a/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0
+++ b/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=Retrieve names of code references
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Sub-Identify/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=505bca99df420c178567e6e1672528dc
+_md5_=f426165db23b0ab0317559ebf2a18e04
diff --git a/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0 b/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
index 4d14905f3b35..ece467f323f1 100644
--- a/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
+++ b/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
@@ -4,10 +4,10 @@ DESCRIPTION=Apparently run a function in a higher stack frame
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Sub-Uplevel/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=82acac478164d56926822b0047747ec6
+_md5_=053abf429185fbd0a3bda36949188fcb
diff --git a/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0 b/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0
index bf22f7d2c1cc..a739ee9f43f5 100644
--- a/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0
+++ b/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=Override subroutines in a module for unit testing
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-MockModule/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/SUPER virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.11.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=298e0c639d9e68c9f3bd5b0124f47842
+_md5_=1ef7255c9c132f62b5265650d5370b7a
diff --git a/metadata/md5-cache/dev-perl/Text-CSV-1.940.0 b/metadata/md5-cache/dev-perl/Text-CSV-1.940.0
index fb1c0fdaa941..35158489087f 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV-1.940.0
+++ b/metadata/md5-cache/dev-perl/Text-CSV-1.940.0
@@ -4,10 +4,10 @@ DESCRIPTION=Manipulate comma-separated value strings
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Text-CSV/
 IUSE=test +xs
-KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=xs? ( >=dev-perl/Text-CSV_XS-1.20.0 ) virtual/perl-IO dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.94.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=5057efb1349d974f380ca92af7f434e3
+_md5_=21b673d8f4aff0eb821eac83929e90a4
diff --git a/metadata/md5-cache/dev-perl/Text-CSV_XS-1.280.0 b/metadata/md5-cache/dev-perl/Text-CSV_XS-1.280.0
index 341de7e69bca..61c46e824ac7 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV_XS-1.280.0
+++ b/metadata/md5-cache/dev-perl/Text-CSV_XS-1.280.0
@@ -4,10 +4,10 @@ DESCRIPTION=Comma-separated values manipulation routines
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Text-CSV_XS/
 IUSE=test examples
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.28.tgz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9e75c9024e501e82abf8540b25ed10f0
+_md5_=b9cd4ca00c7ae42da38b40d7c463d468
diff --git a/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0 b/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
index 46320eeb84d6..264fa240c24f 100644
--- a/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
+++ b/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl module that offers a simple to process namespaced XML names
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-NamespaceSupport/
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=8ea701ba81545793def626bae81419fe
+_md5_=211b0158a75bc2ecb50b9fae137b7ab5
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0 b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
index 9834fec6a76e..a3be4744f0f5 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=Base class SAX Drivers and Filters
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-SAX-Base/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/XML-SAX-0.990.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=105b2734b9f77dbfc9cb810f23e83c20
+_md5_=3e37bfeb266d0b52ee5faf5ce8c45768
diff --git a/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0 b/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
index 5d549e7c0be5..6a8d62a3db3d 100644
--- a/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
+++ b/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Fast, lightweight YAML loader and dumper
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/YAML-Syck/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.30.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=e1762645a5decc27ba620bc6f74379f4
+_md5_=549f9e16d1b64372351ea0ba5a705897
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.324.0 b/metadata/md5-cache/dev-perl/glib-perl-1.324.0
index 4082a241fe73..518825b5a2b3 100644
--- a/metadata/md5-cache/dev-perl/glib-perl-1.324.0
+++ b/metadata/md5-cache/dev-perl/glib-perl-1.324.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2 virtual/perl-ExtUtils-MakeMaker >=dev-perl/ExtUtils-Dep
 DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
 EAPI=6
 HOMEPAGE=http://gtk2-perl.sf.net/ http://search.cpan.org/dist/Glib/
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.324.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=dfca3866703c6ceae33ab7209b5f09c4
+_md5_=dd5bbcaecd5a09074cf6099b58e57d06
diff --git a/metadata/md5-cache/dev-php/pecl-redis-3.1.2 b/metadata/md5-cache/dev-php/pecl-redis-3.1.2
index 11e30dcd0f94..613d9ab02b0e 100644
--- a/metadata/md5-cache/dev-php/pecl-redis-3.1.2
+++ b/metadata/md5-cache/dev-php/pecl-redis-3.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=PHP extension for interfacing with Redis
 EAPI=6
 HOMEPAGE=http://pecl.php.net/redis
 IUSE=igbinary +session php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=PHP-3.01
 RDEPEND=igbinary? ( php_targets_php5-6? ( dev-php/igbinary[php_targets_php5-6] ) php_targets_php7-0? ( dev-php/igbinary[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/igbinary[php_targets_php7-1] ) ) !dev-php/pecl-redis:7 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://pecl.php.net/get/redis-3.1.2.tgz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	f0b4914f85a3c676561454b15a910dc6	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=d2486ea4331fad815be5388f44e99cd6
+_md5_=396e8480676c0ecc87ea3e6c19d37927
diff --git a/metadata/md5-cache/dev-python/Babel-2.3.4 b/metadata/md5-cache/dev-python/Babel-2.3.4
index fe552ce6f740..b82bff38124d 100644
--- a/metadata/md5-cache/dev-python/Babel-2.3.4
+++ b/metadata/md5-cache/dev-python/Babel-2.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of tools for internationalizing Python applications
 EAPI=5
 HOMEPAGE=http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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
+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
 LICENSE=BSD
 RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.3.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4116fc03f6b439c188b49b8a6e011e8a
+_md5_=51327949ccd32d9fb0e44db491102973
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.12 b/metadata/md5-cache/dev-python/PyQt4-4.12
index 829c5d6986b3..7d2f51b1b65f 100644
--- a/metadata/md5-cache/dev-python/PyQt4-4.12
+++ b/metadata/md5-cache/dev-python/PyQt4-4.12
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
 IUSE=X compat dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg testlib webkit xmlpatterns python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( kde? ( >=media-libs/phonon-4.7[qt4] ) !kde? ( || ( >=dev-qt/qtphonon-4.8.5:4 >=media-libs/phonon-4.7[qt4] ) ) ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) sql? ( X ) testlib? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/PyQt4_gpl_x11-4.12.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=f2fa8526592dbc1060826b7885d59b62
+_md5_=6b6dfdbfee26291623bb0d27b6be2bb6
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.3 b/metadata/md5-cache/dev-python/appdirs-1.4.3
index 3660c863f0dd..e464c02240a8 100644
--- a/metadata/md5-cache/dev-python/appdirs-1.4.3
+++ b/metadata/md5-cache/dev-python/appdirs-1.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=Module for determining appropriate platform-specific dirs
 EAPI=6
 HOMEPAGE=https://github.com/ActiveState/appdirs
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ActiveState/appdirs/archive/1.4.3.tar.gz -> appdirs-1.4.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7effe4360a564cc69078d4bdda878985
+_md5_=f1a5567ac985d38c87dc367cad1339cc
diff --git a/metadata/md5-cache/dev-python/automat-0.6.0 b/metadata/md5-cache/dev-python/automat-0.6.0
new file mode 100644
index 000000000000..077cf76666cc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/automat-0.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/m2r[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Self-service finite-state machines for the programmer on the go
+EAPI=6
+HOMEPAGE=https://github.com/glyph/automat https://pypi.python.org/pypi/Automat
+IUSE=examples test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/A/Automat/Automat-0.6.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=50ae46a614d48744902e0c60fea0fe68
diff --git a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4 b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1
similarity index 90%
rename from metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4
rename to metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1
index 4d0f2e9f0b78..46f675c486ca 100644
--- a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4
+++ b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/rst-linker[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) test? ( >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/rst-linker[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) test? ( >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 DESCRIPTION=Backport of functools.lru_cache from Python 3.3
 EAPI=6
 HOMEPAGE=https://github.com/jaraco/backports.functools_lru_cache
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0941b152e1a034ee12f3e75b32c3b104
+_md5_=7b384fa58b2ef2dc6f8f53dff53db7d6
diff --git a/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.5.0.1-r1 b/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.5.0.1-r1
index d614699b3784..49eaba8485da 100644
--- a/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.5.0.1-r1
+++ b/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.5.0.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.5.0.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0b382813a6981fe62aa01bed29286015
+_md5_=08718c9b30672b9a4f9449c277be0686
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.1.1 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.1.1
deleted file mode 100644
index 9a82324a5155..000000000000
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[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(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Backport of unittest.mock
-EAPI=5
-HOMEPAGE=https://github.com/jaraco/backports.unittest_mock
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.1.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=039cd0880318adcfce0c541314f47267
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.3 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
new file mode 100644
index 000000000000..9241ad906822
--- /dev/null
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/jaraco-packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rst-linker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Backport of unittest.mock
+EAPI=6
+HOMEPAGE=https://github.com/jaraco/backports.unittest_mock
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.3.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=d328027291ecbd61151f2845aa9e1950
diff --git a/metadata/md5-cache/dev-python/certifi-2017.1.23 b/metadata/md5-cache/dev-python/certifi-2017.1.23
index bef66579ea51..0c48300d7b0b 100644
--- a/metadata/md5-cache/dev-python/certifi-2017.1.23
+++ b/metadata/md5-cache/dev-python/certifi-2017.1.23
@@ -4,11 +4,11 @@ DESCRIPTION=Python package for providing Mozilla's CA Bundle
 EAPI=6
 HOMEPAGE=http://certifi.io/ https://pypi.python.org/pypi/certifi
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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=LGPL-2.1
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2017.1.23.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4a231e0651cfca4859c2cc00e4b64c47
+_md5_=5374147a999b23544b114b24a0e0bad7
diff --git a/metadata/md5-cache/dev-python/cython-0.25.2 b/metadata/md5-cache/dev-python/cython-0.25.2
index 5d896307657d..cbdd2cb75065 100644
--- a/metadata/md5-cache/dev-python/cython-0.25.2
+++ b/metadata/md5-cache/dev-python/cython-0.25.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Python to C compiler
 EAPI=6
 HOMEPAGE=http://cython.org https://pypi.python.org/pypi/Cython
 IUSE=doc emacs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) 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(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cython/Cython-0.25.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=46eea55a5b5f4c4800bdc811694475a0
+_md5_=7630edee5659468e6539111cdbc4a9d6
diff --git a/metadata/md5-cache/dev-python/dnspython-1.15.0-r1 b/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
index 2640c24ce8ed..9b4ee2b065c2 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
+++ b/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=DNS toolkit for Python
 EAPI=6
 HOMEPAGE=http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython
 IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/dnspython:py2 !dev-python/dnspython:py3 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dnspython/dnspython-1.15.0.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=1bda152235385e9cfa2773e0c6356bfd
+_md5_=3962876a2eace88f52670db8c320801d
diff --git a/metadata/md5-cache/dev-python/flake8-2.5.4 b/metadata/md5-cache/dev-python/flake8-2.5.4
index 5bbf2a80c76b..93183d79e5ff 100644
--- a/metadata/md5-cache/dev-python/flake8-2.5.4
+++ b/metadata/md5-cache/dev-python/flake8-2.5.4
@@ -4,7 +4,7 @@ DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
 EAPI=5
 HOMEPAGE=https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.5.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b7762a19efacf9feb0f2b4c9aafb85ca
+_md5_=90dba11f1a6b672deff9438403b21dd8
diff --git a/metadata/md5-cache/dev-python/hpack-2.3.0-r1 b/metadata/md5-cache/dev-python/hpack-2.3.0-r1
index bda3bb62ce3f..538551c29eb1 100644
--- a/metadata/md5-cache/dev-python/hpack-2.3.0-r1
+++ b/metadata/md5-cache/dev-python/hpack-2.3.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( >=dev-python/pytest-2.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-cov-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-xdist-1.14.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hypothesis-3.4.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Pure-Python HPACK header compression
 EAPI=6
-HOMEPAGE=http://python-hyper.org/hpack https://pypi.python.org/pypi/hpack
+HOMEPAGE=https://python-hyper.org/hpack/en/latest/ https://pypi.python.org/pypi/hpack
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/h/hpack/hpack-2.3.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a9ee22fcddb2cc3b6084530851b59a08
+_md5_=7665cdbcae7e7334bc3e5c6ad2f90e1c
diff --git a/metadata/md5-cache/dev-python/hpack-3.0.0 b/metadata/md5-cache/dev-python/hpack-3.0.0
new file mode 100644
index 000000000000..2592703bfada
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hpack-3.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/pytest-2.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-cov-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-xdist-1.14.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hypothesis-3.4.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Pure-Python HPACK header compression
+EAPI=6
+HOMEPAGE=https://python-hyper.org/hpack/en/latest/ https://pypi.python.org/pypi/hpack
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/python-hyper/hpack/archive/v3.0.0.tar.gz -> hpack-3.0.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=0d9aafaf9a2da4dd70eeed8714734c05
diff --git a/metadata/md5-cache/dev-python/hyper-h2-2.6.2 b/metadata/md5-cache/dev-python/hyper-h2-2.6.2
new file mode 100644
index 000000000000..c10e278328bd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hyper-h2-2.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/hyperframe-4.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyperframe-6.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hpack-2.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hpack-4.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=HTTP/2 State-Machine based protocol implementation
+EAPI=6
+HOMEPAGE=http://python-hyper.org/h2 https://pypi.python.org/pypi/h2
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/hyperframe-4.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyperframe-6.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hpack-2.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hpack-4.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v2.6.2.tar.gz -> hyper-h2-2.6.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=294b087627d2e938e4c909c0041a829b
diff --git a/metadata/md5-cache/dev-python/hyper-h2-3.0.0 b/metadata/md5-cache/dev-python/hyper-h2-3.0.1
similarity index 92%
rename from metadata/md5-cache/dev-python/hyper-h2-3.0.0
rename to metadata/md5-cache/dev-python/hyper-h2-3.0.1
index 436b1aa2340c..bd894cbd24e2 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-3.0.0
+++ b/metadata/md5-cache/dev-python/hyper-h2-3.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyperframe-6.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hpack-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hpack-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyperframe-6.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hpack-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hpack-4.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=HTTP/2 State-Machine based protocol implementation
 EAPI=6
-HOMEPAGE=http://python-hyper.org/h2 https://pypi.python.org/pypi/h2
+HOMEPAGE=https://python-hyper.org/h2/en/stable/ https://pypi.python.org/pypi/h2
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyperframe-6.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hpack-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hpack-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyperframe-6.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hpack-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hpack-4.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=mirror://pypi/h/h2/h2-3.0.0.tar.gz -> hyper-h2-3.0.0.tar.gz
+SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v3.0.1.tar.gz -> hyper-h2-3.0.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c859b3e367be81c85af5b81b3dd2622e
+_md5_=822ec13a34bfd49cce95a96a55d37681
diff --git a/metadata/md5-cache/dev-python/hyperframe-4.0.1 b/metadata/md5-cache/dev-python/hyperframe-4.0.1
index fab1f666b7f7..4ed341e7e122 100644
--- a/metadata/md5-cache/dev-python/hyperframe-4.0.1
+++ b/metadata/md5-cache/dev-python/hyperframe-4.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=HTTP/2 framing layer for Python
 EAPI=6
-HOMEPAGE=http://python-hyper.org/hyperframe https://pypi.python.org/pypi/hyperframe
+HOMEPAGE=https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-4.0.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b3d771066c5bd592505f8c9275b377b2
+_md5_=8ccfb5bd366b8fd8abe2a0845d28d7fa
diff --git a/metadata/md5-cache/dev-python/hyperframe-5.0.0 b/metadata/md5-cache/dev-python/hyperframe-5.0.0
index ccab11ea7c86..4bbcbe24897d 100644
--- a/metadata/md5-cache/dev-python/hyperframe-5.0.0
+++ b/metadata/md5-cache/dev-python/hyperframe-5.0.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=HTTP/2 framing layer for Python
 EAPI=6
-HOMEPAGE=http://python-hyper.org/hyperframe https://pypi.python.org/pypi/hyperframe
+HOMEPAGE=https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-5.0.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b23d391454ec6c7de13000f0abfbdac7
+_md5_=8ccfb5bd366b8fd8abe2a0845d28d7fa
diff --git a/metadata/md5-cache/dev-python/hyperframe-5.1.0 b/metadata/md5-cache/dev-python/hyperframe-5.1.0
new file mode 100644
index 000000000000..1b46293cde39
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hyperframe-5.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=HTTP/2 framing layer for Python
+EAPI=6
+HOMEPAGE=https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hyperframe/hyperframe-5.1.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=8ccfb5bd366b8fd8abe2a0845d28d7fa
diff --git a/metadata/md5-cache/dev-python/idna-2.5 b/metadata/md5-cache/dev-python/idna-2.5
index f2fe040b9ec9..3f3bbafc232c 100644
--- a/metadata/md5-cache/dev-python/idna-2.5
+++ b/metadata/md5-cache/dev-python/idna-2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Internationalized Domain Names in Applications (IDNA)
 EAPI=6
 HOMEPAGE=https://github.com/kjd/idna
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna/idna-2.5.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d9e842aaee5865c095249f3123d7db47
+_md5_=dd20cc0d02db250e2095c8bf8441cf88
diff --git a/metadata/md5-cache/dev-python/incremental-17.5.0 b/metadata/md5-cache/dev-python/incremental-17.5.0
new file mode 100644
index 000000000000..65f1cb19b58b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/incremental-17.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Incremental is a small library that versions your Python projects
+EAPI=6
+HOMEPAGE=https://github.com/hawkowl/incremental https://pypi.python.org/pypi/incremental
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/i/incremental/incremental-17.5.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=15c126596fd1bf3c1728d53f44e6f907
diff --git a/metadata/md5-cache/dev-python/jinja-2.9.5 b/metadata/md5-cache/dev-python/jinja-2.9.5
index 4e28123e8acd..335f06d57b62 100644
--- a/metadata/md5-cache/dev-python/jinja-2.9.5
+++ b/metadata/md5-cache/dev-python/jinja-2.9.5
@@ -4,7 +4,7 @@ DESCRIPTION=A full-featured template engine for Python
 EAPI=6
 HOMEPAGE=http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2
 IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD
 RDEPEND=dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/jinja:compat python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/2.9.5.tar.gz -> jinja-2.9.5.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=563db2e0b97d57a3009c7c41af636f91
+_md5_=69ba6607aae5a9b7f0c5d6c1e18eddc3
diff --git a/metadata/md5-cache/dev-python/lxml-3.7.3 b/metadata/md5-cache/dev-python/lxml-3.7.3
index 602181cbec03..84fc1cfd5dc5 100644
--- a/metadata/md5-cache/dev-python/lxml-3.7.3
+++ b/metadata/md5-cache/dev-python/lxml-3.7.3
@@ -4,11 +4,11 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=6
 HOMEPAGE=http://lxml.de/ https://pypi.python.org/pypi/lxml/
 IUSE=doc examples +threads test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.9.2 >=dev-libs/libxslt-1.1.28 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.7.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4820bfc9cbf690dacf6df4c5b0506444
+_md5_=2ce80b92d74f7292fba10a1ddb420d72
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.6 b/metadata/md5-cache/dev-python/m2r-0.1.6
new file mode 100644
index 000000000000..30d33c3fb698
--- /dev/null
+++ b/metadata/md5-cache/dev-python/m2r-0.1.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Markdown to reStructuredText converter
+EAPI=6
+HOMEPAGE=https://github.com/miyakogi/m2r https://pypi.python.org/pypi/m2r
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/m/m2r/m2r-0.1.6.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=ef5f7e94c36ed48c3ab4571a7b38b4de
diff --git a/metadata/md5-cache/dev-python/mako-1.0.3 b/metadata/md5-cache/dev-python/mako-1.0.3
index 2a6cfab8c898..5932d43e504a 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.3
+++ b/metadata/md5-cache/dev-python/mako-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A Python templating language
 EAPI=5
 HOMEPAGE=http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako
 IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a093df7c6398ef76730ee43a724479e2
+_md5_=dfd6140cdbb5c4982845263854209714
diff --git a/metadata/md5-cache/dev-python/packaging-16.8 b/metadata/md5-cache/dev-python/packaging-16.8
index 796ceb76c649..69b962802e5f 100644
--- a/metadata/md5-cache/dev-python/packaging-16.8
+++ b/metadata/md5-cache/dev-python/packaging-16.8
@@ -4,11 +4,11 @@ DESCRIPTION=Core utilities for Python packages
 EAPI=6
 HOMEPAGE=https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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=|| ( Apache-2.0 BSD-2 )
 RDEPEND=>=dev-python/pyparsing-2.1.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/packaging/packaging-16.8.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=46ed6b37feba3b09aafcb32803f9f25f
+_md5_=1fa8dbf5309cafffc574b877e6205863
diff --git a/metadata/md5-cache/dev-python/paramiko-2.1.2 b/metadata/md5-cache/dev-python/paramiko-2.1.2
index 9117891f75bc..1e70e041b605 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.1.2
+++ b/metadata/md5-cache/dev-python/paramiko-2.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=SSH2 protocol library
 EAPI=6
 HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/
 IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/cryptography-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paramiko/paramiko-2.1.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7ed2789e98112068c79d18768dc04e11
+_md5_=e1f54598a1a225ddfcc3a96a2243c4cd
diff --git a/metadata/md5-cache/dev-python/pip-9.0.1-r1 b/metadata/md5-cache/dev-python/pip-9.0.1-r1
index 6df463f106af..a51abed83e66 100644
--- a/metadata/md5-cache/dev-python/pip-9.0.1-r1
+++ b/metadata/md5-cache/dev-python/pip-9.0.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=6
 HOMEPAGE=https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-9.0.1.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d9dda92c4fa63a93cbafcfd3e794adb5
+_md5_=767b7771f73a93185b20a4c0bdc26579
diff --git a/metadata/md5-cache/dev-python/pynacl-1.1.2 b/metadata/md5-cache/dev-python/pynacl-1.1.2
new file mode 100644
index 000000000000..daccea48fd63
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pynacl-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/18 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
+EAPI=6
+HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/18 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/pyca/pynacl/archive/1.1.2.tar.gz -> pynacl-1.1.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=c5cad07fa4a9f855d186775eba88add4
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.1.10 b/metadata/md5-cache/dev-python/pyparsing-2.1.10
index 5611908e756b..242292b789d5 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.1.10
+++ b/metadata/md5-cache/dev-python/pyparsing-2.1.10
@@ -4,7 +4,7 @@ DESCRIPTION=Easy-to-use Python module for text parsing
 EAPI=6
 HOMEPAGE=http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing
 IUSE=doc examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyparsing/pyparsing-2.1.10.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=091cf5c5438ccefe744756022f588166
+_md5_=1bcd484cfd179c4dde6085c24e5fcb31
diff --git a/metadata/md5-cache/dev-python/pypy-5.8.0 b/metadata/md5-cache/dev-python/pypy-5.8.0
new file mode 100644
index 000000000000..d7ccb90f8c6d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-5.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0 doc? ( dev-python/sphinx ) || ( >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) test? ( dev-python/pytest )
+DESCRIPTION=A fast, compliant alternative implementation of the Python language
+EAPI=6
+HOMEPAGE=http://pypy.org/
+IUSE=bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0
+SLOT=0/41
+SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.13-0.tar.xz
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f9380d8e0222225bdd4184d74cfee0b8
diff --git a/metadata/md5-cache/dev-python/pypy-9999 b/metadata/md5-cache/dev-python/pypy-9999
index 7ca3b5decd2b..19b377dd8362 100644
--- a/metadata/md5-cache/dev-python/pypy-9999
+++ b/metadata/md5-cache/dev-python/pypy-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/e
 SLOT=0/41
 SRC_URI=https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.13-0.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8d685528cc80ce002c2114c0fed78464
+_md5_=b6578b5fe7e87c8b7a9cde6f07b32726
diff --git a/metadata/md5-cache/dev-python/pypy-bin-5.8.0 b/metadata/md5-cache/dev-python/pypy-bin-5.8.0
new file mode 100644
index 000000000000..731fd2889cf9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-bin-5.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=app-arch/bzip2:0= dev-libs/expat:0= dev-libs/libffi:0= dev-libs/openssl:0=[-bindist] sys-libs/glibc:2.2= sys-libs/ncurses:0/6 sys-libs/zlib:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0 app-arch/lzip app-arch/xz-utils doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) dev-python/sphinx )
+DESCRIPTION=Pre-built version of PyPy
+EAPI=6
+HOMEPAGE=http://pypy.org/
+IUSE=doc gdbm +jit sqlite cpu_flags_x86_sse2 test tk
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:0= dev-libs/expat:0= dev-libs/libffi:0= dev-libs/openssl:0=[-bindist] sys-libs/glibc:2.2= sys-libs/ncurses:0/6 sys-libs/zlib:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0
+REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
+SLOT=0/41
+SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.13-0.tar.xz amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.8.0/pypy-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.8.0/pypy-bin-5.8.0-amd64+bzip2+ncurses.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.8.0/pypy-bin-5.8.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.8.0/pypy-bin-5.8.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.8.0/pypy-bin-5.8.0-x86+bzip2+ncurses.tar.lz ) ) )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=883e63e8e570a3f60b964c81a44f8a88
diff --git a/metadata/md5-cache/dev-python/pypy3-5.7.1-r2 b/metadata/md5-cache/dev-python/pypy3-5.7.1-r2
index f5644eae870b..3048af6d3e1a 100644
--- a/metadata/md5-cache/dev-python/pypy3-5.7.1-r2
+++ b/metadata/md5-cache/dev-python/pypy3-5.7.1-r2
@@ -3,11 +3,11 @@ DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/ex
 DESCRIPTION=A fast, compliant alternative implementation of the Python (3.3) language
 EAPI=6
 HOMEPAGE=http://pypy.org/
-IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk
+KEYWORDS=~amd64 ~amd64-linux
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
 SLOT=0/57
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.tar.bz2
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fe7340ea0f3116591f1617aa0b138b31
+_md5_=3bf9573d42c8aac74dba5c710b957667
diff --git a/metadata/md5-cache/dev-python/pypy3-5.8.0 b/metadata/md5-cache/dev-python/pypy3-5.8.0
new file mode 100644
index 000000000000..cde48ce9059d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-5.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0 low-memory? ( virtual/pypy:0 ) !low-memory? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.3) language
+EAPI=6
+HOMEPAGE=http://pypy.org/
+IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
+SLOT=0/58
+SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.8.0-src.tar.bz2
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=add813018e08ef261a0a2bc330b339b9
diff --git a/metadata/md5-cache/dev-python/pypy3-9999 b/metadata/md5-cache/dev-python/pypy3-9999
index 5cbf9dbce10c..cf289cff8302 100644
--- a/metadata/md5-cache/dev-python/pypy3-9999
+++ b/metadata/md5-cache/dev-python/pypy3-9999
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
 SLOT=0/57
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fd0ba50e60d0e1ea8f99b95d287c5734
+_md5_=e099e078b6ce795540a322408b4da272
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-5.7.1-r1 b/metadata/md5-cache/dev-python/pypy3-bin-5.7.1-r1
index b2bf7882dc08..6e947b32af54 100644
--- a/metadata/md5-cache/dev-python/pypy3-bin-5.7.1-r1
+++ b/metadata/md5-cache/dev-python/pypy3-bin-5.7.1-r1
@@ -3,12 +3,11 @@ DEPEND=app-arch/bzip2:0= dev-libs/expat:0= dev-libs/libffi:0= dev-libs/openssl:0
 DESCRIPTION=A fast, compliant alternative implementation of Python 3.3 (binary package)
 EAPI=6
 HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
+IUSE=gdbm +jit sqlite test tk
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=app-arch/bzip2:0= dev-libs/expat:0= dev-libs/libffi:0= dev-libs/openssl:0=[-bindist] sys-libs/glibc:2.2= sys-libs/ncurses:0/6 sys-libs/zlib:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
 SLOT=0/57
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.7.1/pypy3-bin-5.7.1-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.7.1/pypy3-bin-5.7.1-amd64+bzip2+ncurses.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.7.1/pypy3-bin-5.7.1-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.7.1/pypy3-bin-5.7.1-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.7.1/pypy3-bin-5.7.1-x86+bzip2+ncurses.tar.lz ) ) )
+SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.7.1/pypy3-bin-5.7.1-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.7.1/pypy3-bin-5.7.1-amd64+bzip2+ncurses.tar.lz ) )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=03e577f96037cce89e76cbcb40e539ad
+_md5_=12fb1c002aa9fdab67762c481f2d8e23
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-5.8.0-r1 b/metadata/md5-cache/dev-python/pypy3-bin-5.8.0-r1
new file mode 100644
index 000000000000..a02dd4ec6cd9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-bin-5.8.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=app-arch/bzip2:0= dev-libs/expat:0= dev-libs/libffi:0= dev-libs/openssl:0=[-bindist] sys-libs/glibc:2.2= sys-libs/ncurses:0/6 sys-libs/zlib:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0 app-arch/lzip app-arch/xz-utils test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) )
+DESCRIPTION=A fast, compliant alternative implementation of Python 3.3 (binary package)
+EAPI=6
+HOMEPAGE=http://pypy.org/
+IUSE=gdbm +jit sqlite test tk
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:0= dev-libs/expat:0= dev-libs/libffi:0= dev-libs/openssl:0=[-bindist] sys-libs/glibc:2.2= sys-libs/ncurses:0/6 sys-libs/zlib:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0
+SLOT=0/58
+SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.8.0-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.8.0/pypy3-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.8.0/pypy3-bin-5.8.0-amd64+bzip2+ncurses.tar.lz ) )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6122cae032ed1bf4e668018d933de6e5
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.4.2-r1 b/metadata/md5-cache/dev-python/python-dateutil-2.4.2-r1
index dd9ad8dce365..56f0fee1583f 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.4.2-r1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.4.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Extensions to the standard Python datetime module
 EAPI=5
 HOMEPAGE=https://dateutil.readthedocs.org/ https://pypi.python.org/pypi/python-dateutil https://github.com/dateutil/dateutil/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.4.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e2f780a8a0945904c4a487b44794f889
+_md5_=c8a70fad32efc72bd039b8bdcba0fe0d
diff --git a/metadata/md5-cache/dev-python/python-novaclient-6.0.0 b/metadata/md5-cache/dev-python/python-novaclient-6.0.0
deleted file mode 100644
index c6faa7739019..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keyring-5.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-client-config-1.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-client-config-1.19.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-client-config-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-client-config-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-client-config-1.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-sphinx-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=6
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-6.0.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=fdaf581b71cf17961d575e1d9dc43983
diff --git a/metadata/md5-cache/dev-python/python-novaclient-6.0.1 b/metadata/md5-cache/dev-python/python-novaclient-6.0.1
index ee007a73a096..59ef50a6e6df 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-6.0.1
+++ b/metadata/md5-cache/dev-python/python-novaclient-6.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack Nova API
 EAPI=6
 HOMEPAGE=https://github.com/openstack/python-novaclient
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-6.0.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b4eb14483e3bb783450adc2dc42a9da5
+_md5_=84b139e373ea8b24223bb88fe64342b6
diff --git a/metadata/md5-cache/dev-python/python-novaclient-7.1.0 b/metadata/md5-cache/dev-python/python-novaclient-7.1.0
deleted file mode 100644
index c1609394e561..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-7.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[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(-)] test? ( >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keyring-5.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-client-config-1.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-4.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=6
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-7.1.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=19e92fd226f7b0ca7888c98070d7d522
diff --git a/metadata/md5-cache/dev-python/python-novaclient-7.1.1 b/metadata/md5-cache/dev-python/python-novaclient-7.1.1
deleted file mode 100644
index ea8a79ab6fdb..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-7.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-2.0.0[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(-)] test? ( >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keyring-5.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-client-config-1.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-4.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=6
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-7.1.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=93b49bb50005002eef29fa1695ac9860
diff --git a/metadata/md5-cache/dev-python/python-novaclient-7.1.2 b/metadata/md5-cache/dev-python/python-novaclient-7.1.2
index 952847a83c24..57f9a57f5331 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-7.1.2
+++ b/metadata/md5-cache/dev-python/python-novaclient-7.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack Nova API
 EAPI=6
 HOMEPAGE=https://github.com/openstack/python-novaclient
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-7.1.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=6c609a58ac4abbdb00b834685731a115
+_md5_=19e92fd226f7b0ca7888c98070d7d522
diff --git a/metadata/md5-cache/dev-python/pytz-2017.2 b/metadata/md5-cache/dev-python/pytz-2017.2
index 7b2bce546919..35af0e4b7bf9 100644
--- a/metadata/md5-cache/dev-python/pytz-2017.2
+++ b/metadata/md5-cache/dev-python/pytz-2017.2
@@ -4,11 +4,11 @@ DESCRIPTION=World timezone definitions for Python
 EAPI=6
 HOMEPAGE=http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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
+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
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2017.2.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=015e89af284d47c6d0b33e1bd36874c1
+_md5_=58e5e5d8e4acc55b522f30c76f10ee3f
diff --git a/metadata/md5-cache/dev-python/requests-2.12.5 b/metadata/md5-cache/dev-python/requests-2.12.5
index 0091515fa17c..ccc385247a4f 100644
--- a/metadata/md5-cache/dev-python/requests-2.12.5
+++ b/metadata/md5-cache/dev-python/requests-2.12.5
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library for human beings
 EAPI=6
 HOMEPAGE=http://python-requests.org/ https://pypi.python.org/pypi/requests
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.4.30[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.14[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.12.5.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=48d91a58e4aa5273c8fcd8ba6a11698f
+_md5_=b9ff00b889a55ffd606e80799b2233cf
diff --git a/metadata/md5-cache/dev-python/setuptools-34.0.2-r1 b/metadata/md5-cache/dev-python/setuptools-34.0.2-r1
index f0f478126318..781011b7769c 100644
--- a/metadata/md5-cache/dev-python/setuptools-34.0.2-r1
+++ b/metadata/md5-cache/dev-python/setuptools-34.0.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 RDEPEND=>=dev-python/packaging-16.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-34.0.2.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2314fe69c449b03157f25a1dc2857027
+_md5_=c4fb28de48d4d7fe0afefd67fd0607e1
diff --git a/metadata/md5-cache/dev-python/sip-4.19.1 b/metadata/md5-cache/dev-python/sip-4.19.1
index ddaa478d9a0d..e95498caa4f9 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.1
+++ b/metadata/md5-cache/dev-python/sip-4.19.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python extension module generator for C and C++ libraries
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
 IUSE=debug doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/pyqt/sip-4.19.1.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=e7d85bf189a061f182582cade9ce8156
+_md5_=9223b8c840a41ac171e437829d1b9cb4
diff --git a/metadata/md5-cache/dev-python/spark-parser-1.6.1 b/metadata/md5-cache/dev-python/spark-parser-1.6.1
new file mode 100644
index 000000000000..d25c0037094d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spark-parser-1.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An Early-Algorithm Context-free grammar Parser
+EAPI=6
+HOMEPAGE=https://github.com/rocky/python-spark/ https://pypi.python.org/pypi/spark_parser
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/s/spark_parser/spark_parser-1.6.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=fba48b6a56e09f91b3657a65e3d3570c
diff --git a/metadata/md5-cache/dev-python/uncompyle6-2.10.1 b/metadata/md5-cache/dev-python/uncompyle6-2.10.1
new file mode 100644
index 000000000000..a1258ac3f444
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uncompyle6-2.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/xdis-3.3.1 <dev-python/xdis-3.4.0 >=dev-python/spark-parser-1.6.1 <dev-python/spark-parser-1.7.0 test? ( >=dev-python/nose-1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python cross-version byte-code deparser
+EAPI=6
+HOMEPAGE=https://github.com/rocky/python-uncompyle6/ https://pypi.python.org/pypi/uncompyle6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/xdis-3.3.1 <dev-python/xdis-3.4.0 >=dev-python/spark-parser-1.6.1 <dev-python/spark-parser-1.7.0 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/u/uncompyle6/uncompyle6-2.10.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=19e54a3aef9d8cbb27e9d9507ff57dfc
diff --git a/metadata/md5-cache/dev-python/webob-1.6.3 b/metadata/md5-cache/dev-python/webob-1.6.3
index 3cd6d9500d79..1c40772a4cb1 100644
--- a/metadata/md5-cache/dev-python/webob-1.6.3
+++ b/metadata/md5-cache/dev-python/webob-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=WSGI request and response object
 EAPI=6
 HOMEPAGE=http://webob.org/ https://pypi.python.org/pypi/WebOb
 IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.6.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=1a2fc82e8a074cfec0ea2ef03966b054
+_md5_=d67c0ba9a5803da5802501c404ce5889
diff --git a/metadata/md5-cache/dev-python/xdis-3.3.1 b/metadata/md5-cache/dev-python/xdis-3.3.1
new file mode 100644
index 000000000000..64881a797756
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xdis-3.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python cross-version byte-code disassembler and marshal routines
+EAPI=6
+HOMEPAGE=https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/x/xdis/xdis-3.3.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=611830e63c9561d5fe6f633c87b2f381
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
new file mode 100644
index 000000000000..c16b2fbadb1a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.7.1 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.0.6:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.7.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango !!x11-libs/cairo[qt4] ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.7.1 ) udev? ( virtual/libudev:= ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.4 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.7.1 )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=accessibility dbus egl eglfs evdev +gif gles2 gtk ibus jpeg libinput +png tslib tuio +udev +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus )
+RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.7.1 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.0.6:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.7.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango !!x11-libs/cairo[qt4] ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.7.1 ) udev? ( virtual/libudev:= ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.4 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
+REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
+RESTRICT=test
+SLOT=5/5.7
+SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qt5-build	16cbfb66f69906d4f3683bd191939f0f	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=408c2cb1addb0626eec508251aab36bc
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2 b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
index 86ceb4be5058..a0cb84f9b8ac 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Pipe to browser utility for use at the shell and within editors
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/bcat
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcat-0.6.2.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=368e844ecac3126941f2836fd5bc5af8
+_md5_=bf71d57e42d9046f2d8c50348988da29
diff --git a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0 b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
index 058d3017ca06..37c97fe3a4de 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
+++ b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/bcrypt_pbkdf-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/bcrypt_pbkdf-1.0.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4e8dab0128b6fcec80e42a61409bafc1
+_md5_=014c664f41ed4e5e881555868481ee9d
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.10.1 b/metadata/md5-cache/dev-ruby/capybara-2.10.1
deleted file mode 100644
index 009b0140ccd6..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-2.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( www-client/firefox ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/launchy[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
-EAPI=5
-HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=2
-SRC_URI=mirror://rubygems/capybara-2.10.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=d2a8f37a44b8df7aad7dd7984c037be4
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.12.0 b/metadata/md5-cache/dev-ruby/capybara-2.14.2
similarity index 97%
rename from metadata/md5-cache/dev-ruby/capybara-2.12.0
rename to metadata/md5-cache/dev-ruby/capybara-2.14.2
index 680d88be347d..1e84d80f3ff4 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.12.0
+++ b/metadata/md5-cache/dev-ruby/capybara-2.14.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( www-client/firefox ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/launchy[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/jnicklas/capybara
 IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
-SRC_URI=mirror://rubygems/capybara-2.12.0.gem
+SRC_URI=mirror://rubygems/capybara-2.14.2.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=a79489a33968d3f6873c399330dc694d
+_md5_=d81ab346620532a9df33bb9daf78ce7c
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
index 57253ddbfa25..5825459e4f93 100644
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Internal HashiCorp service to check version information
 EAPI=5
 HOMEPAGE=http://www.hashicorp.com
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashicorp-checkpoint-0.1.4.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9633e9fd0cad72e36ef7ad2454f6cfe7
+_md5_=df94dcf2b22a4c0f5a14f57cf34bf2d0
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
index acf5483a16d7..3cd7525806f0 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A comprehensive and flexible logging library written in Ruby
 EAPI=5
 HOMEPAGE=http://log4r.sourceforge.net/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-3
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/log4r-1.1.10.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e1ae7d229cf932f2ebd168d45f97423a
+_md5_=df988e9a238c406354d8fe0e3ea825d5
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.6 b/metadata/md5-cache/dev-ruby/mail-2.6.6
new file mode 100644
index 000000000000..f88589269ed1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=An email handling library
+EAPI=6
+HOMEPAGE=https://github.com/mikel/mail
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=2.6
+SRC_URI=https://github.com/mikel/mail/archive/2.6.6.tar.gz -> mail-2.6.6-git.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=42edd28262d9a422ece0865b88574914
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.99.2 b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
index 7126d5c5d435..8a766ceedac2 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.99.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT Artistic GPL-2
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/mime-types-2.99.2.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7c15212de037b78dcfd633c91beba6e0
+_md5_=b225538d3af52c4e0818e65f91eac895
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120
deleted file mode 100644
index de382421d13c..000000000000
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Registry for information about MIME media type definitions
-EAPI=5
-HOMEPAGE=https://github.com/mime-types/mime-types-data
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=3
-SRC_URI=mirror://rubygems/mime-types-data-3.2015.1120.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1772d5bb1067aab457161657654dba2c
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0221 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0221
deleted file mode 100644
index 4f12156960eb..000000000000
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0221
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Registry for information about MIME media type definitions
-EAPI=5
-HOMEPAGE=https://github.com/mime-types/mime-types-data
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=mirror://rubygems/mime-types-data-3.2016.0221.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=72efa1ef07350007a927990282a91316
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521
index 1690d9b4550d..a8f9a322e3ed 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Registry for information about MIME media type definitions
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/mime-types-data
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-data-3.2016.0521.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=72efa1ef07350007a927990282a91316
+_md5_=a13a15edfcdcc1eb243210caaad22768
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
index a91395c9f04a..87102feb9b97 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/minitest-pretty_diff[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/minitest-pretty_diff[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/minitest-pretty_diff[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/minitest-pretty_diff[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/minitest-pretty_diff[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/minitest-pretty_diff[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/minitest-pretty_diff[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Bonus assertions for minitest
 EAPI=6
 HOMEPAGE=https://github.com/halostatue/minitest-bonus-assertions
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/minitest-bonus-assertions-3.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1e94de59d6d635943325f8934a4e5ed2
+_md5_=01369bb7bb6881347644a0c1211e07f1
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.0 b/metadata/md5-cache/dev-ruby/oauth2-1.4.0
new file mode 100644
index 000000000000..d6f53f6feac7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] <dev-ruby/faraday-0.13[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.13[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.13[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
+EAPI=5
+HOMEPAGE=https://github.com/intridea/oauth2
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64 ~ppc64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] <dev-ruby/faraday-0.13[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.13[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.13[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.0.tar.gz -> oauth2-1.4.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=070c76a7bed7f25eebb4fa38b2a1a6d3
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
index 819ad1f78aaf..1c10d502357e 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=http://thoughtbot.com/projects/shoulda
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e7737585150e5121a2749b1bca4e6b18
+_md5_=fc6412fbf414e7619a3cfc56bf6e79c4
diff --git a/metadata/md5-cache/dev-ruby/thor-0.19.4 b/metadata/md5-cache/dev-ruby/thor-0.19.4
new file mode 100644
index 000000000000..4d5c0c64c0ff
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/thor-0.19.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/childlabor[ruby_targets_ruby21] dev-ruby/webmock:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/childlabor[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/childlabor[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A scripting framework that replaces rake and sake
+EAPI=6
+HOMEPAGE=http://whatisthor.com/
+IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~ppc64 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/erikhuda/thor/archive/v0.19.4.tar.gz -> thor-git-0.19.4.tgz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=501800e49724b65beffdff2e937b937b
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.4 b/metadata/md5-cache/dev-ruby/unf-0.1.4
index 19267340991e..f6c4d0d82dc1 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.4
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/unf_ext[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/unf_ext[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/unf_ext[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/shoulda[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/unf_ext[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/unf_ext[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/unf_ext[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/unf_ext[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/shoulda[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/shoulda[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-unf
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/unf_ext[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/unf_ext[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/unf_ext[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( dev-ruby/unf_ext[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/unf_ext[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/unf_ext[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/unf_ext[ruby_targets_ruby24] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf-0.1.4.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cafda2d7abe16687941572d1bc1b2370
+_md5_=485a11120ff4cc7952c1f6ec4065c58e
diff --git a/metadata/md5-cache/dev-tcltk/bwidget-1.9.8 b/metadata/md5-cache/dev-tcltk/bwidget-1.9.8
index d655fbddaa7b..f5f25e3ca288 100644
--- a/metadata/md5-cache/dev-tcltk/bwidget-1.9.8
+++ b/metadata/md5-cache/dev-tcltk/bwidget-1.9.8
@@ -4,10 +4,10 @@ DESCRIPTION=High-level widget set for Tcl/Tk
 EAPI=5
 HOMEPAGE=http://tcllib.sourceforge.net/
 IUSE=doc test
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=tcltk
 RDEPEND=dev-lang/tk:0
 SLOT=0
 SRC_URI=mirror://sourceforge/project/tcllib/BWidget/1.9.8/bwidget-1.9.8.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=783c3615914acc6db9c168ca402e7e44
+_md5_=afb211d6d94dfb9d0fff63b7ac14ebb6
diff --git a/metadata/md5-cache/dev-tex/bibtexu-3.71_p20160523 b/metadata/md5-cache/dev-tex/bibtexu-3.71_p20160523
index f93f4a8b1302..734cc2e88ad8 100644
--- a/metadata/md5-cache/dev-tex/bibtexu-3.71_p20160523
+++ b/metadata/md5-cache/dev-tex/bibtexu-3.71_p20160523
@@ -4,9 +4,9 @@ DESCRIPTION=8-bit Implementation of BibTeX 0.99 with a Very Large Capacity
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=doc source
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/kpathsea-6.2.1:= >=dev-libs/icu-4.4:= !<app-text/texlive-core-2013
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz mirror://gentoo/texlive-module-bibtex8-2016.tar.xz mirror://gentoo/texlive-module-bibtexu-2016.tar.xz doc? ( mirror://gentoo/texlive-module-bibtex8.doc-2016.tar.xz mirror://gentoo/texlive-module-bibtexu.doc-2016.tar.xz )
-_md5_=257332d067605e942312c2ee7ae37be4
+_md5_=f03247bac69f3623c2de8815c79e5433
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5
index e17d9b55bb9c..98b84743c20c 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Converts (La)TeX to (X)HTML, XML and OO.org
 EAPI=4
 HOMEPAGE=http://www.cse.ohio-state.edu/~gurari/TeX4ht/ http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html
 IUSE=java elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz mirror://gentoo/tex4ht-texlive-2017-02-05.tar.xz
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	latex-package	00777e2de6c20be92a1adce060eeafa4	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fa9df5550fa3d1110ca85034368fe966
+_md5_=fdca0401a417d711fa3096db9c8c3891
diff --git a/metadata/md5-cache/dev-texlive/texlive-basic-2016 b/metadata/md5-cache/dev-texlive/texlive-basic-2016
index 6706cb347f67..6ccb2aec8771 100644
--- a/metadata/md5-cache/dev-texlive/texlive-basic-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-basic-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Essential programs and files
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc +luajittex
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free
 RDEPEND=!<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-latexrecommended-2009 !dev-texlive/texlive-documentation-base !<app-text/dvipsk-5.996_p20160523 >=app-text/texlive-core-2015[luajittex?] !<dev-texlive/texlive-latex-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsfonts-2016.tar.xz mirror://gentoo/texlive-module-bibtex-2016.tar.xz mirror://gentoo/texlive-module-cm-2016.tar.xz mirror://gentoo/texlive-module-enctex-2016.tar.xz mirror://gentoo/texlive-module-etex-2016.tar.xz mirror://gentoo/texlive-module-etex-pkg-2016.tar.xz mirror://gentoo/texlive-module-graphics-def-2016.tar.xz mirror://gentoo/texlive-module-hyph-utf8-2016.tar.xz mirror://gentoo/texlive-module-ifluatex-2016.tar.xz mirror://gentoo/texlive-module-ifxetex-2016.tar.xz mirror://gentoo/texlive-module-knuth-lib-2016.tar.xz mirror://gentoo/texlive-module-knuth-local-2016.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt-2016.tar.xz mirror://gentoo/texlive-module-luatex-2016.tar.xz mirror://gentoo/texlive-module-makeindex-2016.tar.xz mirror://gentoo/texlive-module-metafont-2016.tar.xz mirror://gentoo/texlive-module-mflogo-2016.tar.xz mirror://gentoo/texlive-module-mfware-2016.tar.xz mirror://gentoo/texlive-module-pdftex-2016.tar.xz mirror://gentoo/texlive-module-plain-2016.tar.xz mirror://gentoo/texlive-module-tex-2016.tar.xz mirror://gentoo/texlive-module-tex-ini-files-2016.tar.xz mirror://gentoo/texlive-module-texlive-common-2016.tar.xz mirror://gentoo/texlive-module-texlive-docindex-2016.tar.xz mirror://gentoo/texlive-module-texlive-en-2016.tar.xz mirror://gentoo/texlive-module-texlive-msg-translations-2016.tar.xz mirror://gentoo/texlive-module-texlive-scripts-2016.tar.xz mirror://gentoo/texlive-module-unicode-data-2016.tar.xz mirror://gentoo/texlive-module-updmap-map-2016.tar.xz mirror://gentoo/texlive-module-collection-basic-2016.tar.xz doc? ( mirror://gentoo/texlive-module-amsfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-bibtex.doc-2016.tar.xz mirror://gentoo/texlive-module-cm.doc-2016.tar.xz mirror://gentoo/texlive-module-enctex.doc-2016.tar.xz mirror://gentoo/texlive-module-etex.doc-2016.tar.xz mirror://gentoo/texlive-module-etex-pkg.doc-2016.tar.xz mirror://gentoo/texlive-module-graphics-def.doc-2016.tar.xz mirror://gentoo/texlive-module-hyph-utf8.doc-2016.tar.xz mirror://gentoo/texlive-module-ifluatex.doc-2016.tar.xz mirror://gentoo/texlive-module-ifxetex.doc-2016.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt.doc-2016.tar.xz mirror://gentoo/texlive-module-luatex.doc-2016.tar.xz mirror://gentoo/texlive-module-makeindex.doc-2016.tar.xz mirror://gentoo/texlive-module-metafont.doc-2016.tar.xz mirror://gentoo/texlive-module-mflogo.doc-2016.tar.xz mirror://gentoo/texlive-module-mfware.doc-2016.tar.xz mirror://gentoo/texlive-module-pdftex.doc-2016.tar.xz mirror://gentoo/texlive-module-tex.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-ini-files.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-common.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-docindex.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-en.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-scripts.doc-2016.tar.xz mirror://gentoo/texlive-module-unicode-data.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-amsfonts.source-2016.tar.xz mirror://gentoo/texlive-module-hyph-utf8.source-2016.tar.xz mirror://gentoo/texlive-module-ifluatex.source-2016.tar.xz mirror://gentoo/texlive-module-ifxetex.source-2016.tar.xz mirror://gentoo/texlive-module-mflogo.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=0259a645586c7d3301f25a592102b0a1
+_md5_=60653f9153068c314eeebd53a09313f2
diff --git a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2016 b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2016
index 2878cb4a9dec..129eacf191d9 100644
--- a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive BibTeX additional styles
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2016 !=dev-texlive/texlive-latexextra-2007* !<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-publishers-2014 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aichej-2016.tar.xz mirror://gentoo/texlive-module-ajl-2016.tar.xz mirror://gentoo/texlive-module-amsrefs-2016.tar.xz mirror://gentoo/texlive-module-apacite-2016.tar.xz mirror://gentoo/texlive-module-apalike2-2016.tar.xz mirror://gentoo/texlive-module-archaeologie-2016.tar.xz mirror://gentoo/texlive-module-beebe-2016.tar.xz mirror://gentoo/texlive-module-besjournals-2016.tar.xz mirror://gentoo/texlive-module-bestpapers-2016.tar.xz mirror://gentoo/texlive-module-bibarts-2016.tar.xz mirror://gentoo/texlive-module-biber-2016.tar.xz mirror://gentoo/texlive-module-bibexport-2016.tar.xz mirror://gentoo/texlive-module-bibhtml-2016.tar.xz mirror://gentoo/texlive-module-biblatex-abnt-2016.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous-2016.tar.xz mirror://gentoo/texlive-module-biblatex-apa-2016.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle-2016.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother-2016.tar.xz mirror://gentoo/texlive-module-biblatex-bwl-2016.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector-2016.tar.xz mirror://gentoo/texlive-module-biblatex-chem-2016.tar.xz mirror://gentoo/texlive-module-biblatex-chicago-2016.tar.xz mirror://gentoo/texlive-module-biblatex-claves-2016.tar.xz mirror://gentoo/texlive-module-biblatex-dw-2016.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi-2016.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015-2016.tar.xz mirror://gentoo/texlive-module-biblatex-gost-2016.tar.xz mirror://gentoo/texlive-module-biblatex-historian-2016.tar.xz mirror://gentoo/texlive-module-biblatex-ieee-2016.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra-2016.tar.xz mirror://gentoo/texlive-module-biblatex-iso690-2016.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss-2016.tar.xz mirror://gentoo/texlive-module-biblatex-lni-2016.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw-2016.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology-2016.tar.xz mirror://gentoo/texlive-module-biblatex-mla-2016.tar.xz mirror://gentoo/texlive-module-biblatex-morenames-2016.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm-2016.tar.xz mirror://gentoo/texlive-module-biblatex-musuos-2016.tar.xz mirror://gentoo/texlive-module-biblatex-nature-2016.tar.xz mirror://gentoo/texlive-module-biblatex-nejm-2016.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic-2016.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle-2016.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy-2016.tar.xz mirror://gentoo/texlive-module-biblatex-phys-2016.tar.xz mirror://gentoo/texlive-module-biblatex-publist-2016.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor-2016.tar.xz mirror://gentoo/texlive-module-biblatex-sbl-2016.tar.xz mirror://gentoo/texlive-module-biblatex-science-2016.tar.xz mirror://gentoo/texlive-module-biblatex-source-division-2016.tar.xz mirror://gentoo/texlive-module-biblatex-subseries-2016.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal-2016.tar.xz mirror://gentoo/texlive-module-biblatex-trad-2016.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit-2016.tar.xz mirror://gentoo/texlive-module-biblist-2016.tar.xz mirror://gentoo/texlive-module-bibtexperllibs-2016.tar.xz mirror://gentoo/texlive-module-bibtopic-2016.tar.xz mirror://gentoo/texlive-module-bibtopicprefix-2016.tar.xz mirror://gentoo/texlive-module-bibunits-2016.tar.xz mirror://gentoo/texlive-module-biolett-bst-2016.tar.xz mirror://gentoo/texlive-module-bookdb-2016.tar.xz mirror://gentoo/texlive-module-breakcites-2016.tar.xz mirror://gentoo/texlive-module-cell-2016.tar.xz mirror://gentoo/texlive-module-chbibref-2016.tar.xz mirror://gentoo/texlive-module-chicago-2016.tar.xz mirror://gentoo/texlive-module-chicago-annote-2016.tar.xz mirror://gentoo/texlive-module-chembst-2016.tar.xz mirror://gentoo/texlive-module-chscite-2016.tar.xz mirror://gentoo/texlive-module-citeall-2016.tar.xz mirror://gentoo/texlive-module-collref-2016.tar.xz mirror://gentoo/texlive-module-compactbib-2016.tar.xz mirror://gentoo/texlive-module-crossrefware-2016.tar.xz mirror://gentoo/texlive-module-custom-bib-2016.tar.xz mirror://gentoo/texlive-module-din1505-2016.tar.xz mirror://gentoo/texlive-module-dk-bib-2016.tar.xz mirror://gentoo/texlive-module-doipubmed-2016.tar.xz mirror://gentoo/texlive-module-ecobiblatex-2016.tar.xz mirror://gentoo/texlive-module-economic-2016.tar.xz mirror://gentoo/texlive-module-fbs-2016.tar.xz mirror://gentoo/texlive-module-figbib-2016.tar.xz mirror://gentoo/texlive-module-footbib-2016.tar.xz mirror://gentoo/texlive-module-francais-bst-2016.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl-2016.tar.xz mirror://gentoo/texlive-module-harvard-2016.tar.xz mirror://gentoo/texlive-module-harvmac-2016.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift-2016.tar.xz mirror://gentoo/texlive-module-ietfbibs-2016.tar.xz mirror://gentoo/texlive-module-ijqc-2016.tar.xz mirror://gentoo/texlive-module-inlinebib-2016.tar.xz mirror://gentoo/texlive-module-iopart-num-2016.tar.xz mirror://gentoo/texlive-module-jneurosci-2016.tar.xz mirror://gentoo/texlive-module-jurabib-2016.tar.xz mirror://gentoo/texlive-module-ksfh_nat-2016.tar.xz mirror://gentoo/texlive-module-listbib-2016.tar.xz mirror://gentoo/texlive-module-logreq-2016.tar.xz mirror://gentoo/texlive-module-margbib-2016.tar.xz mirror://gentoo/texlive-module-multibib-2016.tar.xz mirror://gentoo/texlive-module-multibibliography-2016.tar.xz mirror://gentoo/texlive-module-munich-2016.tar.xz mirror://gentoo/texlive-module-nar-2016.tar.xz mirror://gentoo/texlive-module-nmbib-2016.tar.xz mirror://gentoo/texlive-module-notes2bib-2016.tar.xz mirror://gentoo/texlive-module-notex-bst-2016.tar.xz mirror://gentoo/texlive-module-oscola-2016.tar.xz mirror://gentoo/texlive-module-perception-2016.tar.xz mirror://gentoo/texlive-module-pnas2009-2016.tar.xz mirror://gentoo/texlive-module-rsc-2016.tar.xz mirror://gentoo/texlive-module-showtags-2016.tar.xz mirror://gentoo/texlive-module-sort-by-letters-2016.tar.xz mirror://gentoo/texlive-module-splitbib-2016.tar.xz mirror://gentoo/texlive-module-turabian-formatting-2016.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger-2016.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin-2016.tar.xz mirror://gentoo/texlive-module-urlbst-2016.tar.xz mirror://gentoo/texlive-module-usebib-2016.tar.xz mirror://gentoo/texlive-module-vak-2016.tar.xz mirror://gentoo/texlive-module-xcite-2016.tar.xz mirror://gentoo/texlive-module-collection-bibtexextra-2016.tar.xz doc? ( mirror://gentoo/texlive-module-amsrefs.doc-2016.tar.xz mirror://gentoo/texlive-module-apacite.doc-2016.tar.xz mirror://gentoo/texlive-module-archaeologie.doc-2016.tar.xz mirror://gentoo/texlive-module-besjournals.doc-2016.tar.xz mirror://gentoo/texlive-module-bestpapers.doc-2016.tar.xz mirror://gentoo/texlive-module-bibarts.doc-2016.tar.xz mirror://gentoo/texlive-module-biber.doc-2016.tar.xz mirror://gentoo/texlive-module-bibexport.doc-2016.tar.xz mirror://gentoo/texlive-module-bibhtml.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-abnt.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-apa.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-bwl.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-chem.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-chicago.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-claves.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-dw.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-gost.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-historian.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-ieee.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-iso690.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-lni.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-mla.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-morenames.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-musuos.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-nature.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-nejm.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-phys.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-publist.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-sbl.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-science.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-source-division.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-subseries.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-trad.doc-2016.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit.doc-2016.tar.xz mirror://gentoo/texlive-module-biblist.doc-2016.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.doc-2016.tar.xz mirror://gentoo/texlive-module-bibtopic.doc-2016.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.doc-2016.tar.xz mirror://gentoo/texlive-module-bibunits.doc-2016.tar.xz mirror://gentoo/texlive-module-biolett-bst.doc-2016.tar.xz mirror://gentoo/texlive-module-bookdb.doc-2016.tar.xz mirror://gentoo/texlive-module-breakcites.doc-2016.tar.xz mirror://gentoo/texlive-module-cell.doc-2016.tar.xz mirror://gentoo/texlive-module-chbibref.doc-2016.tar.xz mirror://gentoo/texlive-module-chicago-annote.doc-2016.tar.xz mirror://gentoo/texlive-module-chembst.doc-2016.tar.xz mirror://gentoo/texlive-module-chscite.doc-2016.tar.xz mirror://gentoo/texlive-module-citeall.doc-2016.tar.xz mirror://gentoo/texlive-module-collref.doc-2016.tar.xz mirror://gentoo/texlive-module-crossrefware.doc-2016.tar.xz mirror://gentoo/texlive-module-custom-bib.doc-2016.tar.xz mirror://gentoo/texlive-module-din1505.doc-2016.tar.xz mirror://gentoo/texlive-module-dk-bib.doc-2016.tar.xz mirror://gentoo/texlive-module-doipubmed.doc-2016.tar.xz mirror://gentoo/texlive-module-ecobiblatex.doc-2016.tar.xz mirror://gentoo/texlive-module-economic.doc-2016.tar.xz mirror://gentoo/texlive-module-figbib.doc-2016.tar.xz mirror://gentoo/texlive-module-footbib.doc-2016.tar.xz mirror://gentoo/texlive-module-francais-bst.doc-2016.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.doc-2016.tar.xz mirror://gentoo/texlive-module-harvard.doc-2016.tar.xz mirror://gentoo/texlive-module-harvmac.doc-2016.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift.doc-2016.tar.xz mirror://gentoo/texlive-module-ietfbibs.doc-2016.tar.xz mirror://gentoo/texlive-module-ijqc.doc-2016.tar.xz mirror://gentoo/texlive-module-inlinebib.doc-2016.tar.xz mirror://gentoo/texlive-module-iopart-num.doc-2016.tar.xz mirror://gentoo/texlive-module-jneurosci.doc-2016.tar.xz mirror://gentoo/texlive-module-jurabib.doc-2016.tar.xz mirror://gentoo/texlive-module-listbib.doc-2016.tar.xz mirror://gentoo/texlive-module-logreq.doc-2016.tar.xz mirror://gentoo/texlive-module-margbib.doc-2016.tar.xz mirror://gentoo/texlive-module-multibib.doc-2016.tar.xz mirror://gentoo/texlive-module-multibibliography.doc-2016.tar.xz mirror://gentoo/texlive-module-munich.doc-2016.tar.xz mirror://gentoo/texlive-module-nmbib.doc-2016.tar.xz mirror://gentoo/texlive-module-notes2bib.doc-2016.tar.xz mirror://gentoo/texlive-module-oscola.doc-2016.tar.xz mirror://gentoo/texlive-module-perception.doc-2016.tar.xz mirror://gentoo/texlive-module-rsc.doc-2016.tar.xz mirror://gentoo/texlive-module-showtags.doc-2016.tar.xz mirror://gentoo/texlive-module-sort-by-letters.doc-2016.tar.xz mirror://gentoo/texlive-module-splitbib.doc-2016.tar.xz mirror://gentoo/texlive-module-turabian-formatting.doc-2016.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger.doc-2016.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin.doc-2016.tar.xz mirror://gentoo/texlive-module-urlbst.doc-2016.tar.xz mirror://gentoo/texlive-module-usebib.doc-2016.tar.xz mirror://gentoo/texlive-module-vak.doc-2016.tar.xz mirror://gentoo/texlive-module-xcite.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-amsrefs.source-2016.tar.xz mirror://gentoo/texlive-module-apacite.source-2016.tar.xz mirror://gentoo/texlive-module-bibarts.source-2016.tar.xz mirror://gentoo/texlive-module-biber.source-2016.tar.xz mirror://gentoo/texlive-module-bibexport.source-2016.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.source-2016.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.source-2016.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.source-2016.tar.xz mirror://gentoo/texlive-module-bibtopic.source-2016.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.source-2016.tar.xz mirror://gentoo/texlive-module-bibunits.source-2016.tar.xz mirror://gentoo/texlive-module-chembst.source-2016.tar.xz mirror://gentoo/texlive-module-chscite.source-2016.tar.xz mirror://gentoo/texlive-module-collref.source-2016.tar.xz mirror://gentoo/texlive-module-custom-bib.source-2016.tar.xz mirror://gentoo/texlive-module-dk-bib.source-2016.tar.xz mirror://gentoo/texlive-module-doipubmed.source-2016.tar.xz mirror://gentoo/texlive-module-footbib.source-2016.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.source-2016.tar.xz mirror://gentoo/texlive-module-harvard.source-2016.tar.xz mirror://gentoo/texlive-module-jurabib.source-2016.tar.xz mirror://gentoo/texlive-module-listbib.source-2016.tar.xz mirror://gentoo/texlive-module-margbib.source-2016.tar.xz mirror://gentoo/texlive-module-multibib.source-2016.tar.xz mirror://gentoo/texlive-module-multibibliography.source-2016.tar.xz mirror://gentoo/texlive-module-nmbib.source-2016.tar.xz mirror://gentoo/texlive-module-notes2bib.source-2016.tar.xz mirror://gentoo/texlive-module-rsc.source-2016.tar.xz mirror://gentoo/texlive-module-splitbib.source-2016.tar.xz mirror://gentoo/texlive-module-urlbst.source-2016.tar.xz mirror://gentoo/texlive-module-usebib.source-2016.tar.xz mirror://gentoo/texlive-module-xcite.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=8cc95ed47e6584cc4d24e8f31a89043f
+_md5_=811f7cea492352e7fb7b525072c3794b
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2016 b/metadata/md5-cache/dev-texlive/texlive-context-2016
index f865953b95f6..1aee55a98f04 100644
--- a/metadata/md5-cache/dev-texlive/texlive-context-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive ConTeXt and packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 GPL-3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-latex-2010 !<dev-texlive/texlive-latex-2010 >=app-text/texlive-core-2010[xetex] >=dev-texlive/texlive-metapost-2010 dev-lang/ruby >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-context-2016.tar.xz mirror://gentoo/texlive-module-jmn-2016.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn-2016.tar.xz mirror://gentoo/texlive-module-context-account-2016.tar.xz mirror://gentoo/texlive-module-context-algorithmic-2016.tar.xz mirror://gentoo/texlive-module-context-animation-2016.tar.xz mirror://gentoo/texlive-module-context-annotation-2016.tar.xz mirror://gentoo/texlive-module-context-bnf-2016.tar.xz mirror://gentoo/texlive-module-context-chromato-2016.tar.xz mirror://gentoo/texlive-module-context-cmscbf-2016.tar.xz mirror://gentoo/texlive-module-context-cmttbf-2016.tar.xz mirror://gentoo/texlive-module-context-construction-plan-2016.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers-2016.tar.xz mirror://gentoo/texlive-module-context-degrade-2016.tar.xz mirror://gentoo/texlive-module-context-fancybreak-2016.tar.xz mirror://gentoo/texlive-module-context-filter-2016.tar.xz mirror://gentoo/texlive-module-context-french-2016.tar.xz mirror://gentoo/texlive-module-context-fullpage-2016.tar.xz mirror://gentoo/texlive-module-context-gantt-2016.tar.xz mirror://gentoo/texlive-module-context-gnuplot-2016.tar.xz mirror://gentoo/texlive-module-context-inifile-2016.tar.xz mirror://gentoo/texlive-module-context-layout-2016.tar.xz mirror://gentoo/texlive-module-context-letter-2016.tar.xz mirror://gentoo/texlive-module-context-lettrine-2016.tar.xz mirror://gentoo/texlive-module-context-mathsets-2016.tar.xz mirror://gentoo/texlive-module-context-rst-2016.tar.xz mirror://gentoo/texlive-module-context-ruby-2016.tar.xz mirror://gentoo/texlive-module-context-simplefonts-2016.tar.xz mirror://gentoo/texlive-module-context-simpleslides-2016.tar.xz mirror://gentoo/texlive-module-context-title-2016.tar.xz mirror://gentoo/texlive-module-context-transliterator-2016.tar.xz mirror://gentoo/texlive-module-context-typearea-2016.tar.xz mirror://gentoo/texlive-module-context-typescripts-2016.tar.xz mirror://gentoo/texlive-module-context-vim-2016.tar.xz mirror://gentoo/texlive-module-context-visualcounter-2016.tar.xz mirror://gentoo/texlive-module-collection-context-2016.tar.xz doc? ( mirror://gentoo/texlive-module-context.doc-2016.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn.doc-2016.tar.xz mirror://gentoo/texlive-module-context-account.doc-2016.tar.xz mirror://gentoo/texlive-module-context-animation.doc-2016.tar.xz mirror://gentoo/texlive-module-context-annotation.doc-2016.tar.xz mirror://gentoo/texlive-module-context-bnf.doc-2016.tar.xz mirror://gentoo/texlive-module-context-chromato.doc-2016.tar.xz mirror://gentoo/texlive-module-context-cmscbf.doc-2016.tar.xz mirror://gentoo/texlive-module-context-cmttbf.doc-2016.tar.xz mirror://gentoo/texlive-module-context-construction-plan.doc-2016.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers.doc-2016.tar.xz mirror://gentoo/texlive-module-context-degrade.doc-2016.tar.xz mirror://gentoo/texlive-module-context-fancybreak.doc-2016.tar.xz mirror://gentoo/texlive-module-context-filter.doc-2016.tar.xz mirror://gentoo/texlive-module-context-french.doc-2016.tar.xz mirror://gentoo/texlive-module-context-fullpage.doc-2016.tar.xz mirror://gentoo/texlive-module-context-gantt.doc-2016.tar.xz mirror://gentoo/texlive-module-context-gnuplot.doc-2016.tar.xz mirror://gentoo/texlive-module-context-inifile.doc-2016.tar.xz mirror://gentoo/texlive-module-context-layout.doc-2016.tar.xz mirror://gentoo/texlive-module-context-letter.doc-2016.tar.xz mirror://gentoo/texlive-module-context-lettrine.doc-2016.tar.xz mirror://gentoo/texlive-module-context-mathsets.doc-2016.tar.xz mirror://gentoo/texlive-module-context-rst.doc-2016.tar.xz mirror://gentoo/texlive-module-context-ruby.doc-2016.tar.xz mirror://gentoo/texlive-module-context-simplefonts.doc-2016.tar.xz mirror://gentoo/texlive-module-context-simpleslides.doc-2016.tar.xz mirror://gentoo/texlive-module-context-title.doc-2016.tar.xz mirror://gentoo/texlive-module-context-transliterator.doc-2016.tar.xz mirror://gentoo/texlive-module-context-typearea.doc-2016.tar.xz mirror://gentoo/texlive-module-context-typescripts.doc-2016.tar.xz mirror://gentoo/texlive-module-context-vim.doc-2016.tar.xz mirror://gentoo/texlive-module-context-visualcounter.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-context-visualcounter.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=62277709b9f416b9797483e60c7b8c9b
+_md5_=19f1c32e3578109266624fc77c4bf50d
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2016 b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2016
index 9883bdce4b51..a0c338b5f0f7 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Additional fonts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !=dev-texlive/texlive-langpolish-2007* !<dev-texlive/texlive-latexextra-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-Asana-Math-2016.tar.xz mirror://gentoo/texlive-module-academicons-2016.tar.xz mirror://gentoo/texlive-module-accanthis-2016.tar.xz mirror://gentoo/texlive-module-adforn-2016.tar.xz mirror://gentoo/texlive-module-adfsymbols-2016.tar.xz mirror://gentoo/texlive-module-aecc-2016.tar.xz mirror://gentoo/texlive-module-alegreya-2016.tar.xz mirror://gentoo/texlive-module-allrunes-2016.tar.xz mirror://gentoo/texlive-module-almfixed-2016.tar.xz mirror://gentoo/texlive-module-anonymouspro-2016.tar.xz mirror://gentoo/texlive-module-antiqua-2016.tar.xz mirror://gentoo/texlive-module-antt-2016.tar.xz mirror://gentoo/texlive-module-archaic-2016.tar.xz mirror://gentoo/texlive-module-arev-2016.tar.xz mirror://gentoo/texlive-module-arimo-2016.tar.xz mirror://gentoo/texlive-module-asapsym-2016.tar.xz mirror://gentoo/texlive-module-ascii-font-2016.tar.xz mirror://gentoo/texlive-module-aspectratio-2016.tar.xz mirror://gentoo/texlive-module-astro-2016.tar.xz mirror://gentoo/texlive-module-augie-2016.tar.xz mirror://gentoo/texlive-module-auncial-new-2016.tar.xz mirror://gentoo/texlive-module-aurical-2016.tar.xz mirror://gentoo/texlive-module-b1encoding-2016.tar.xz mirror://gentoo/texlive-module-barcodes-2016.tar.xz mirror://gentoo/texlive-module-baskervald-2016.tar.xz mirror://gentoo/texlive-module-baskervaldx-2016.tar.xz mirror://gentoo/texlive-module-baskervillef-2016.tar.xz mirror://gentoo/texlive-module-bbding-2016.tar.xz mirror://gentoo/texlive-module-bbm-2016.tar.xz mirror://gentoo/texlive-module-bbm-macros-2016.tar.xz mirror://gentoo/texlive-module-bbold-2016.tar.xz mirror://gentoo/texlive-module-bbold-type1-2016.tar.xz mirror://gentoo/texlive-module-belleek-2016.tar.xz mirror://gentoo/texlive-module-bera-2016.tar.xz mirror://gentoo/texlive-module-berenisadf-2016.tar.xz mirror://gentoo/texlive-module-beuron-2016.tar.xz mirror://gentoo/texlive-module-bguq-2016.tar.xz mirror://gentoo/texlive-module-blacklettert1-2016.tar.xz mirror://gentoo/texlive-module-boisik-2016.tar.xz mirror://gentoo/texlive-module-bookhands-2016.tar.xz mirror://gentoo/texlive-module-boondox-2016.tar.xz mirror://gentoo/texlive-module-braille-2016.tar.xz mirror://gentoo/texlive-module-brushscr-2016.tar.xz mirror://gentoo/texlive-module-cabin-2016.tar.xz mirror://gentoo/texlive-module-caladea-2016.tar.xz mirror://gentoo/texlive-module-calligra-2016.tar.xz mirror://gentoo/texlive-module-calligra-type1-2016.tar.xz mirror://gentoo/texlive-module-cantarell-2016.tar.xz mirror://gentoo/texlive-module-carlito-2016.tar.xz mirror://gentoo/texlive-module-carolmin-ps-2016.tar.xz mirror://gentoo/texlive-module-ccicons-2016.tar.xz mirror://gentoo/texlive-module-cfr-initials-2016.tar.xz mirror://gentoo/texlive-module-cfr-lm-2016.tar.xz mirror://gentoo/texlive-module-cherokee-2016.tar.xz mirror://gentoo/texlive-module-chivo-2016.tar.xz mirror://gentoo/texlive-module-cinzel-2016.tar.xz mirror://gentoo/texlive-module-clearsans-2016.tar.xz mirror://gentoo/texlive-module-cm-lgc-2016.tar.xz mirror://gentoo/texlive-module-cm-unicode-2016.tar.xz mirror://gentoo/texlive-module-cmbright-2016.tar.xz mirror://gentoo/texlive-module-cmexb-2016.tar.xz mirror://gentoo/texlive-module-cmll-2016.tar.xz mirror://gentoo/texlive-module-cmpica-2016.tar.xz mirror://gentoo/texlive-module-cmtiup-2016.tar.xz mirror://gentoo/texlive-module-cochineal-2016.tar.xz mirror://gentoo/texlive-module-comfortaa-2016.tar.xz mirror://gentoo/texlive-module-comicneue-2016.tar.xz mirror://gentoo/texlive-module-concmath-fonts-2016.tar.xz mirror://gentoo/texlive-module-cookingsymbols-2016.tar.xz mirror://gentoo/texlive-module-cormorantgaramond-2016.tar.xz mirror://gentoo/texlive-module-countriesofeurope-2016.tar.xz mirror://gentoo/texlive-module-courier-scaled-2016.tar.xz mirror://gentoo/texlive-module-crimson-2016.tar.xz mirror://gentoo/texlive-module-cryst-2016.tar.xz mirror://gentoo/texlive-module-cyklop-2016.tar.xz mirror://gentoo/texlive-module-dancers-2016.tar.xz mirror://gentoo/texlive-module-dantelogo-2016.tar.xz mirror://gentoo/texlive-module-dejavu-2016.tar.xz mirror://gentoo/texlive-module-dice-2016.tar.xz mirror://gentoo/texlive-module-dictsym-2016.tar.xz mirror://gentoo/texlive-module-dingbat-2016.tar.xz mirror://gentoo/texlive-module-doublestroke-2016.tar.xz mirror://gentoo/texlive-module-dozenal-2016.tar.xz mirror://gentoo/texlive-module-drm-2016.tar.xz mirror://gentoo/texlive-module-droid-2016.tar.xz mirror://gentoo/texlive-module-duerer-2016.tar.xz mirror://gentoo/texlive-module-duerer-latex-2016.tar.xz mirror://gentoo/texlive-module-dutchcal-2016.tar.xz mirror://gentoo/texlive-module-ean-2016.tar.xz mirror://gentoo/texlive-module-ebgaramond-2016.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths-2016.tar.xz mirror://gentoo/texlive-module-ecc-2016.tar.xz mirror://gentoo/texlive-module-eco-2016.tar.xz mirror://gentoo/texlive-module-eiad-2016.tar.xz mirror://gentoo/texlive-module-eiad-ltx-2016.tar.xz mirror://gentoo/texlive-module-electrum-2016.tar.xz mirror://gentoo/texlive-module-elvish-2016.tar.xz mirror://gentoo/texlive-module-epigrafica-2016.tar.xz mirror://gentoo/texlive-module-epsdice-2016.tar.xz mirror://gentoo/texlive-module-erewhon-2016.tar.xz mirror://gentoo/texlive-module-esrelation-2016.tar.xz mirror://gentoo/texlive-module-esstix-2016.tar.xz mirror://gentoo/texlive-module-esvect-2016.tar.xz mirror://gentoo/texlive-module-eulervm-2016.tar.xz mirror://gentoo/texlive-module-euxm-2016.tar.xz mirror://gentoo/texlive-module-fbb-2016.tar.xz mirror://gentoo/texlive-module-fdsymbol-2016.tar.xz mirror://gentoo/texlive-module-fetamont-2016.tar.xz mirror://gentoo/texlive-module-feyn-2016.tar.xz mirror://gentoo/texlive-module-fge-2016.tar.xz mirror://gentoo/texlive-module-fira-2016.tar.xz mirror://gentoo/texlive-module-foekfont-2016.tar.xz mirror://gentoo/texlive-module-fonetika-2016.tar.xz mirror://gentoo/texlive-module-fontawesome-2016.tar.xz mirror://gentoo/texlive-module-fontmfizz-2016.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic-2016.tar.xz mirror://gentoo/texlive-module-fourier-2016.tar.xz mirror://gentoo/texlive-module-fouriernc-2016.tar.xz mirror://gentoo/texlive-module-frcursive-2016.tar.xz mirror://gentoo/texlive-module-frederika2016-2016.tar.xz mirror://gentoo/texlive-module-genealogy-2016.tar.xz mirror://gentoo/texlive-module-gentium-tug-2016.tar.xz mirror://gentoo/texlive-module-gfsartemisia-2016.tar.xz mirror://gentoo/texlive-module-gfsbodoni-2016.tar.xz mirror://gentoo/texlive-module-gfscomplutum-2016.tar.xz mirror://gentoo/texlive-module-gfsdidot-2016.tar.xz mirror://gentoo/texlive-module-gfsneohellenic-2016.tar.xz mirror://gentoo/texlive-module-gfssolomos-2016.tar.xz mirror://gentoo/texlive-module-gillcm-2016.tar.xz mirror://gentoo/texlive-module-gillius-2016.tar.xz mirror://gentoo/texlive-module-gnu-freefont-2016.tar.xz mirror://gentoo/texlive-module-gofonts-2016.tar.xz mirror://gentoo/texlive-module-gothic-2016.tar.xz mirror://gentoo/texlive-module-greenpoint-2016.tar.xz mirror://gentoo/texlive-module-grotesq-2016.tar.xz mirror://gentoo/texlive-module-hacm-2016.tar.xz mirror://gentoo/texlive-module-hands-2016.tar.xz mirror://gentoo/texlive-module-heuristica-2016.tar.xz mirror://gentoo/texlive-module-hfbright-2016.tar.xz mirror://gentoo/texlive-module-hfoldsty-2016.tar.xz mirror://gentoo/texlive-module-ifsym-2016.tar.xz mirror://gentoo/texlive-module-imfellenglish-2016.tar.xz mirror://gentoo/texlive-module-inconsolata-2016.tar.xz mirror://gentoo/texlive-module-initials-2016.tar.xz mirror://gentoo/texlive-module-ipaex-type1-2016.tar.xz mirror://gentoo/texlive-module-iwona-2016.tar.xz mirror://gentoo/texlive-module-jablantile-2016.tar.xz mirror://gentoo/texlive-module-jamtimes-2016.tar.xz mirror://gentoo/texlive-module-junicode-2016.tar.xz mirror://gentoo/texlive-module-kixfont-2016.tar.xz mirror://gentoo/texlive-module-knuthotherfonts-2016.tar.xz mirror://gentoo/texlive-module-kpfonts-2016.tar.xz mirror://gentoo/texlive-module-kurier-2016.tar.xz mirror://gentoo/texlive-module-lato-2016.tar.xz mirror://gentoo/texlive-module-lfb-2016.tar.xz mirror://gentoo/texlive-module-libertine-2016.tar.xz mirror://gentoo/texlive-module-libertinegc-2016.tar.xz mirror://gentoo/texlive-module-libertinus-2016.tar.xz mirror://gentoo/texlive-module-libertinust1math-2016.tar.xz mirror://gentoo/texlive-module-librebaskerville-2016.tar.xz mirror://gentoo/texlive-module-librebodoni-2016.tar.xz mirror://gentoo/texlive-module-librecaslon-2016.tar.xz mirror://gentoo/texlive-module-libris-2016.tar.xz mirror://gentoo/texlive-module-linearA-2016.tar.xz mirror://gentoo/texlive-module-lobster2-2016.tar.xz mirror://gentoo/texlive-module-lxfonts-2016.tar.xz mirror://gentoo/texlive-module-ly1-2016.tar.xz mirror://gentoo/texlive-module-mathabx-2016.tar.xz mirror://gentoo/texlive-module-mathabx-type1-2016.tar.xz mirror://gentoo/texlive-module-mathdesign-2016.tar.xz mirror://gentoo/texlive-module-mdputu-2016.tar.xz mirror://gentoo/texlive-module-mdsymbol-2016.tar.xz mirror://gentoo/texlive-module-merriweather-2016.tar.xz mirror://gentoo/texlive-module-miama-2016.tar.xz mirror://gentoo/texlive-module-mintspirit-2016.tar.xz mirror://gentoo/texlive-module-missaali-2016.tar.xz mirror://gentoo/texlive-module-mnsymbol-2016.tar.xz mirror://gentoo/texlive-module-mweights-2016.tar.xz mirror://gentoo/texlive-module-newpx-2016.tar.xz mirror://gentoo/texlive-module-newtx-2016.tar.xz mirror://gentoo/texlive-module-newtxsf-2016.tar.xz mirror://gentoo/texlive-module-newtxtt-2016.tar.xz mirror://gentoo/texlive-module-nimbus15-2016.tar.xz mirror://gentoo/texlive-module-nkarta-2016.tar.xz mirror://gentoo/texlive-module-noto-2016.tar.xz mirror://gentoo/texlive-module-obnov-2016.tar.xz mirror://gentoo/texlive-module-ocherokee-2016.tar.xz mirror://gentoo/texlive-module-ocr-b-2016.tar.xz mirror://gentoo/texlive-module-ocr-b-outline-2016.tar.xz mirror://gentoo/texlive-module-ogham-2016.tar.xz mirror://gentoo/texlive-module-oinuit-2016.tar.xz mirror://gentoo/texlive-module-old-arrows-2016.tar.xz mirror://gentoo/texlive-module-oldlatin-2016.tar.xz mirror://gentoo/texlive-module-oldstandard-2016.tar.xz mirror://gentoo/texlive-module-opensans-2016.tar.xz mirror://gentoo/texlive-module-orkhun-2016.tar.xz mirror://gentoo/texlive-module-overlock-2016.tar.xz mirror://gentoo/texlive-module-pacioli-2016.tar.xz mirror://gentoo/texlive-module-paratype-2016.tar.xz mirror://gentoo/texlive-module-phaistos-2016.tar.xz mirror://gentoo/texlive-module-phonetic-2016.tar.xz mirror://gentoo/texlive-module-pigpen-2016.tar.xz mirror://gentoo/texlive-module-playfair-2016.tar.xz mirror://gentoo/texlive-module-poltawski-2016.tar.xz mirror://gentoo/texlive-module-prodint-2016.tar.xz mirror://gentoo/texlive-module-punk-2016.tar.xz mirror://gentoo/texlive-module-punk-latex-2016.tar.xz mirror://gentoo/texlive-module-punknova-2016.tar.xz mirror://gentoo/texlive-module-pxtxalfa-2016.tar.xz mirror://gentoo/texlive-module-quattrocento-2016.tar.xz mirror://gentoo/texlive-module-raleway-2016.tar.xz mirror://gentoo/texlive-module-recycle-2016.tar.xz mirror://gentoo/texlive-module-roboto-2016.tar.xz mirror://gentoo/texlive-module-romande-2016.tar.xz mirror://gentoo/texlive-module-rosario-2016.tar.xz mirror://gentoo/texlive-module-rsfso-2016.tar.xz mirror://gentoo/texlive-module-sansmathaccent-2016.tar.xz mirror://gentoo/texlive-module-sansmathfonts-2016.tar.xz mirror://gentoo/texlive-module-sauter-2016.tar.xz mirror://gentoo/texlive-module-sauterfonts-2016.tar.xz mirror://gentoo/texlive-module-schulschriften-2016.tar.xz mirror://gentoo/texlive-module-semaphor-2016.tar.xz mirror://gentoo/texlive-module-skull-2016.tar.xz mirror://gentoo/texlive-module-sourcecodepro-2016.tar.xz mirror://gentoo/texlive-module-sourcesanspro-2016.tar.xz mirror://gentoo/texlive-module-sourceserifpro-2016.tar.xz mirror://gentoo/texlive-module-starfont-2016.tar.xz mirror://gentoo/texlive-module-staves-2016.tar.xz mirror://gentoo/texlive-module-stix-2016.tar.xz mirror://gentoo/texlive-module-superiors-2016.tar.xz mirror://gentoo/texlive-module-svrsymbols-2016.tar.xz mirror://gentoo/texlive-module-tapir-2016.tar.xz mirror://gentoo/texlive-module-tempora-2016.tar.xz mirror://gentoo/texlive-module-tengwarscript-2016.tar.xz mirror://gentoo/texlive-module-tfrupee-2016.tar.xz mirror://gentoo/texlive-module-tinos-2016.tar.xz mirror://gentoo/texlive-module-tpslifonts-2016.tar.xz mirror://gentoo/texlive-module-trajan-2016.tar.xz mirror://gentoo/texlive-module-txfontsb-2016.tar.xz mirror://gentoo/texlive-module-typicons-2016.tar.xz mirror://gentoo/texlive-module-umtypewriter-2016.tar.xz mirror://gentoo/texlive-module-universa-2016.tar.xz mirror://gentoo/texlive-module-universalis-2016.tar.xz mirror://gentoo/texlive-module-uppunctlm-2016.tar.xz mirror://gentoo/texlive-module-urwchancal-2016.tar.xz mirror://gentoo/texlive-module-venturisadf-2016.tar.xz mirror://gentoo/texlive-module-wsuipa-2016.tar.xz mirror://gentoo/texlive-module-xcharter-2016.tar.xz mirror://gentoo/texlive-module-xits-2016.tar.xz mirror://gentoo/texlive-module-yfonts-2016.tar.xz mirror://gentoo/texlive-module-yfonts-t1-2016.tar.xz mirror://gentoo/texlive-module-yinit-otf-2016.tar.xz mirror://gentoo/texlive-module-zlmtt-2016.tar.xz mirror://gentoo/texlive-module-collection-fontsextra-2016.tar.xz doc? ( mirror://gentoo/texlive-module-Asana-Math.doc-2016.tar.xz mirror://gentoo/texlive-module-academicons.doc-2016.tar.xz mirror://gentoo/texlive-module-accanthis.doc-2016.tar.xz mirror://gentoo/texlive-module-adforn.doc-2016.tar.xz mirror://gentoo/texlive-module-adfsymbols.doc-2016.tar.xz mirror://gentoo/texlive-module-aecc.doc-2016.tar.xz mirror://gentoo/texlive-module-alegreya.doc-2016.tar.xz mirror://gentoo/texlive-module-allrunes.doc-2016.tar.xz mirror://gentoo/texlive-module-almfixed.doc-2016.tar.xz mirror://gentoo/texlive-module-anonymouspro.doc-2016.tar.xz mirror://gentoo/texlive-module-antiqua.doc-2016.tar.xz mirror://gentoo/texlive-module-antt.doc-2016.tar.xz mirror://gentoo/texlive-module-archaic.doc-2016.tar.xz mirror://gentoo/texlive-module-arev.doc-2016.tar.xz mirror://gentoo/texlive-module-arimo.doc-2016.tar.xz mirror://gentoo/texlive-module-asapsym.doc-2016.tar.xz mirror://gentoo/texlive-module-ascii-font.doc-2016.tar.xz mirror://gentoo/texlive-module-aspectratio.doc-2016.tar.xz mirror://gentoo/texlive-module-astro.doc-2016.tar.xz mirror://gentoo/texlive-module-augie.doc-2016.tar.xz mirror://gentoo/texlive-module-auncial-new.doc-2016.tar.xz mirror://gentoo/texlive-module-aurical.doc-2016.tar.xz mirror://gentoo/texlive-module-b1encoding.doc-2016.tar.xz mirror://gentoo/texlive-module-barcodes.doc-2016.tar.xz mirror://gentoo/texlive-module-baskervald.doc-2016.tar.xz mirror://gentoo/texlive-module-baskervaldx.doc-2016.tar.xz mirror://gentoo/texlive-module-baskervillef.doc-2016.tar.xz mirror://gentoo/texlive-module-bbding.doc-2016.tar.xz mirror://gentoo/texlive-module-bbm.doc-2016.tar.xz mirror://gentoo/texlive-module-bbm-macros.doc-2016.tar.xz mirror://gentoo/texlive-module-bbold.doc-2016.tar.xz mirror://gentoo/texlive-module-bbold-type1.doc-2016.tar.xz mirror://gentoo/texlive-module-belleek.doc-2016.tar.xz mirror://gentoo/texlive-module-bera.doc-2016.tar.xz mirror://gentoo/texlive-module-berenisadf.doc-2016.tar.xz mirror://gentoo/texlive-module-beuron.doc-2016.tar.xz mirror://gentoo/texlive-module-bguq.doc-2016.tar.xz mirror://gentoo/texlive-module-blacklettert1.doc-2016.tar.xz mirror://gentoo/texlive-module-boisik.doc-2016.tar.xz mirror://gentoo/texlive-module-bookhands.doc-2016.tar.xz mirror://gentoo/texlive-module-boondox.doc-2016.tar.xz mirror://gentoo/texlive-module-braille.doc-2016.tar.xz mirror://gentoo/texlive-module-brushscr.doc-2016.tar.xz mirror://gentoo/texlive-module-cabin.doc-2016.tar.xz mirror://gentoo/texlive-module-caladea.doc-2016.tar.xz mirror://gentoo/texlive-module-calligra.doc-2016.tar.xz mirror://gentoo/texlive-module-calligra-type1.doc-2016.tar.xz mirror://gentoo/texlive-module-cantarell.doc-2016.tar.xz mirror://gentoo/texlive-module-carlito.doc-2016.tar.xz mirror://gentoo/texlive-module-carolmin-ps.doc-2016.tar.xz mirror://gentoo/texlive-module-ccicons.doc-2016.tar.xz mirror://gentoo/texlive-module-cfr-initials.doc-2016.tar.xz mirror://gentoo/texlive-module-cfr-lm.doc-2016.tar.xz mirror://gentoo/texlive-module-cherokee.doc-2016.tar.xz mirror://gentoo/texlive-module-chivo.doc-2016.tar.xz mirror://gentoo/texlive-module-cinzel.doc-2016.tar.xz mirror://gentoo/texlive-module-clearsans.doc-2016.tar.xz mirror://gentoo/texlive-module-cm-lgc.doc-2016.tar.xz mirror://gentoo/texlive-module-cm-unicode.doc-2016.tar.xz mirror://gentoo/texlive-module-cmbright.doc-2016.tar.xz mirror://gentoo/texlive-module-cmexb.doc-2016.tar.xz mirror://gentoo/texlive-module-cmll.doc-2016.tar.xz mirror://gentoo/texlive-module-cmpica.doc-2016.tar.xz mirror://gentoo/texlive-module-cmtiup.doc-2016.tar.xz mirror://gentoo/texlive-module-cochineal.doc-2016.tar.xz mirror://gentoo/texlive-module-comfortaa.doc-2016.tar.xz mirror://gentoo/texlive-module-comicneue.doc-2016.tar.xz mirror://gentoo/texlive-module-concmath-fonts.doc-2016.tar.xz mirror://gentoo/texlive-module-cookingsymbols.doc-2016.tar.xz mirror://gentoo/texlive-module-cormorantgaramond.doc-2016.tar.xz mirror://gentoo/texlive-module-countriesofeurope.doc-2016.tar.xz mirror://gentoo/texlive-module-courier-scaled.doc-2016.tar.xz mirror://gentoo/texlive-module-crimson.doc-2016.tar.xz mirror://gentoo/texlive-module-cryst.doc-2016.tar.xz mirror://gentoo/texlive-module-cyklop.doc-2016.tar.xz mirror://gentoo/texlive-module-dantelogo.doc-2016.tar.xz mirror://gentoo/texlive-module-dejavu.doc-2016.tar.xz mirror://gentoo/texlive-module-dice.doc-2016.tar.xz mirror://gentoo/texlive-module-dictsym.doc-2016.tar.xz mirror://gentoo/texlive-module-dingbat.doc-2016.tar.xz mirror://gentoo/texlive-module-doublestroke.doc-2016.tar.xz mirror://gentoo/texlive-module-dozenal.doc-2016.tar.xz mirror://gentoo/texlive-module-drm.doc-2016.tar.xz mirror://gentoo/texlive-module-droid.doc-2016.tar.xz mirror://gentoo/texlive-module-duerer.doc-2016.tar.xz mirror://gentoo/texlive-module-duerer-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-dutchcal.doc-2016.tar.xz mirror://gentoo/texlive-module-ean.doc-2016.tar.xz mirror://gentoo/texlive-module-ebgaramond.doc-2016.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths.doc-2016.tar.xz mirror://gentoo/texlive-module-ecc.doc-2016.tar.xz mirror://gentoo/texlive-module-eco.doc-2016.tar.xz mirror://gentoo/texlive-module-eiad.doc-2016.tar.xz mirror://gentoo/texlive-module-eiad-ltx.doc-2016.tar.xz mirror://gentoo/texlive-module-electrum.doc-2016.tar.xz mirror://gentoo/texlive-module-elvish.doc-2016.tar.xz mirror://gentoo/texlive-module-epigrafica.doc-2016.tar.xz mirror://gentoo/texlive-module-epsdice.doc-2016.tar.xz mirror://gentoo/texlive-module-erewhon.doc-2016.tar.xz mirror://gentoo/texlive-module-esrelation.doc-2016.tar.xz mirror://gentoo/texlive-module-esstix.doc-2016.tar.xz mirror://gentoo/texlive-module-esvect.doc-2016.tar.xz mirror://gentoo/texlive-module-eulervm.doc-2016.tar.xz mirror://gentoo/texlive-module-fbb.doc-2016.tar.xz mirror://gentoo/texlive-module-fdsymbol.doc-2016.tar.xz mirror://gentoo/texlive-module-fetamont.doc-2016.tar.xz mirror://gentoo/texlive-module-feyn.doc-2016.tar.xz mirror://gentoo/texlive-module-fge.doc-2016.tar.xz mirror://gentoo/texlive-module-fira.doc-2016.tar.xz mirror://gentoo/texlive-module-foekfont.doc-2016.tar.xz mirror://gentoo/texlive-module-fonetika.doc-2016.tar.xz mirror://gentoo/texlive-module-fontawesome.doc-2016.tar.xz mirror://gentoo/texlive-module-fontmfizz.doc-2016.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic.doc-2016.tar.xz mirror://gentoo/texlive-module-fourier.doc-2016.tar.xz mirror://gentoo/texlive-module-fouriernc.doc-2016.tar.xz mirror://gentoo/texlive-module-frcursive.doc-2016.tar.xz mirror://gentoo/texlive-module-frederika2016.doc-2016.tar.xz mirror://gentoo/texlive-module-genealogy.doc-2016.tar.xz mirror://gentoo/texlive-module-gentium-tug.doc-2016.tar.xz mirror://gentoo/texlive-module-gfsartemisia.doc-2016.tar.xz mirror://gentoo/texlive-module-gfsbodoni.doc-2016.tar.xz mirror://gentoo/texlive-module-gfscomplutum.doc-2016.tar.xz mirror://gentoo/texlive-module-gfsdidot.doc-2016.tar.xz mirror://gentoo/texlive-module-gfsneohellenic.doc-2016.tar.xz mirror://gentoo/texlive-module-gfssolomos.doc-2016.tar.xz mirror://gentoo/texlive-module-gillcm.doc-2016.tar.xz mirror://gentoo/texlive-module-gillius.doc-2016.tar.xz mirror://gentoo/texlive-module-gnu-freefont.doc-2016.tar.xz mirror://gentoo/texlive-module-gofonts.doc-2016.tar.xz mirror://gentoo/texlive-module-gothic.doc-2016.tar.xz mirror://gentoo/texlive-module-greenpoint.doc-2016.tar.xz mirror://gentoo/texlive-module-grotesq.doc-2016.tar.xz mirror://gentoo/texlive-module-hacm.doc-2016.tar.xz mirror://gentoo/texlive-module-heuristica.doc-2016.tar.xz mirror://gentoo/texlive-module-hfbright.doc-2016.tar.xz mirror://gentoo/texlive-module-hfoldsty.doc-2016.tar.xz mirror://gentoo/texlive-module-ifsym.doc-2016.tar.xz mirror://gentoo/texlive-module-imfellenglish.doc-2016.tar.xz mirror://gentoo/texlive-module-inconsolata.doc-2016.tar.xz mirror://gentoo/texlive-module-initials.doc-2016.tar.xz mirror://gentoo/texlive-module-ipaex-type1.doc-2016.tar.xz mirror://gentoo/texlive-module-iwona.doc-2016.tar.xz mirror://gentoo/texlive-module-jablantile.doc-2016.tar.xz mirror://gentoo/texlive-module-jamtimes.doc-2016.tar.xz mirror://gentoo/texlive-module-junicode.doc-2016.tar.xz mirror://gentoo/texlive-module-kixfont.doc-2016.tar.xz mirror://gentoo/texlive-module-kpfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-kurier.doc-2016.tar.xz mirror://gentoo/texlive-module-lato.doc-2016.tar.xz mirror://gentoo/texlive-module-lfb.doc-2016.tar.xz mirror://gentoo/texlive-module-libertine.doc-2016.tar.xz mirror://gentoo/texlive-module-libertinegc.doc-2016.tar.xz mirror://gentoo/texlive-module-libertinus.doc-2016.tar.xz mirror://gentoo/texlive-module-libertinust1math.doc-2016.tar.xz mirror://gentoo/texlive-module-librebaskerville.doc-2016.tar.xz mirror://gentoo/texlive-module-librebodoni.doc-2016.tar.xz mirror://gentoo/texlive-module-librecaslon.doc-2016.tar.xz mirror://gentoo/texlive-module-libris.doc-2016.tar.xz mirror://gentoo/texlive-module-linearA.doc-2016.tar.xz mirror://gentoo/texlive-module-lobster2.doc-2016.tar.xz mirror://gentoo/texlive-module-lxfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-ly1.doc-2016.tar.xz mirror://gentoo/texlive-module-mathabx.doc-2016.tar.xz mirror://gentoo/texlive-module-mathabx-type1.doc-2016.tar.xz mirror://gentoo/texlive-module-mathdesign.doc-2016.tar.xz mirror://gentoo/texlive-module-mdputu.doc-2016.tar.xz mirror://gentoo/texlive-module-mdsymbol.doc-2016.tar.xz mirror://gentoo/texlive-module-merriweather.doc-2016.tar.xz mirror://gentoo/texlive-module-miama.doc-2016.tar.xz mirror://gentoo/texlive-module-mintspirit.doc-2016.tar.xz mirror://gentoo/texlive-module-missaali.doc-2016.tar.xz mirror://gentoo/texlive-module-mnsymbol.doc-2016.tar.xz mirror://gentoo/texlive-module-mweights.doc-2016.tar.xz mirror://gentoo/texlive-module-newpx.doc-2016.tar.xz mirror://gentoo/texlive-module-newtx.doc-2016.tar.xz mirror://gentoo/texlive-module-newtxsf.doc-2016.tar.xz mirror://gentoo/texlive-module-newtxtt.doc-2016.tar.xz mirror://gentoo/texlive-module-nimbus15.doc-2016.tar.xz mirror://gentoo/texlive-module-nkarta.doc-2016.tar.xz mirror://gentoo/texlive-module-noto.doc-2016.tar.xz mirror://gentoo/texlive-module-obnov.doc-2016.tar.xz mirror://gentoo/texlive-module-ocherokee.doc-2016.tar.xz mirror://gentoo/texlive-module-ocr-b.doc-2016.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.doc-2016.tar.xz mirror://gentoo/texlive-module-ogham.doc-2016.tar.xz mirror://gentoo/texlive-module-oinuit.doc-2016.tar.xz mirror://gentoo/texlive-module-old-arrows.doc-2016.tar.xz mirror://gentoo/texlive-module-oldlatin.doc-2016.tar.xz mirror://gentoo/texlive-module-oldstandard.doc-2016.tar.xz mirror://gentoo/texlive-module-opensans.doc-2016.tar.xz mirror://gentoo/texlive-module-orkhun.doc-2016.tar.xz mirror://gentoo/texlive-module-overlock.doc-2016.tar.xz mirror://gentoo/texlive-module-pacioli.doc-2016.tar.xz mirror://gentoo/texlive-module-paratype.doc-2016.tar.xz mirror://gentoo/texlive-module-phaistos.doc-2016.tar.xz mirror://gentoo/texlive-module-phonetic.doc-2016.tar.xz mirror://gentoo/texlive-module-pigpen.doc-2016.tar.xz mirror://gentoo/texlive-module-playfair.doc-2016.tar.xz mirror://gentoo/texlive-module-poltawski.doc-2016.tar.xz mirror://gentoo/texlive-module-prodint.doc-2016.tar.xz mirror://gentoo/texlive-module-punk.doc-2016.tar.xz mirror://gentoo/texlive-module-punk-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-punknova.doc-2016.tar.xz mirror://gentoo/texlive-module-pxtxalfa.doc-2016.tar.xz mirror://gentoo/texlive-module-quattrocento.doc-2016.tar.xz mirror://gentoo/texlive-module-raleway.doc-2016.tar.xz mirror://gentoo/texlive-module-recycle.doc-2016.tar.xz mirror://gentoo/texlive-module-roboto.doc-2016.tar.xz mirror://gentoo/texlive-module-romande.doc-2016.tar.xz mirror://gentoo/texlive-module-rosario.doc-2016.tar.xz mirror://gentoo/texlive-module-rsfso.doc-2016.tar.xz mirror://gentoo/texlive-module-sansmathaccent.doc-2016.tar.xz mirror://gentoo/texlive-module-sansmathfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-sauterfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-schulschriften.doc-2016.tar.xz mirror://gentoo/texlive-module-semaphor.doc-2016.tar.xz mirror://gentoo/texlive-module-sourcecodepro.doc-2016.tar.xz mirror://gentoo/texlive-module-sourcesanspro.doc-2016.tar.xz mirror://gentoo/texlive-module-sourceserifpro.doc-2016.tar.xz mirror://gentoo/texlive-module-starfont.doc-2016.tar.xz mirror://gentoo/texlive-module-staves.doc-2016.tar.xz mirror://gentoo/texlive-module-stix.doc-2016.tar.xz mirror://gentoo/texlive-module-superiors.doc-2016.tar.xz mirror://gentoo/texlive-module-svrsymbols.doc-2016.tar.xz mirror://gentoo/texlive-module-tapir.doc-2016.tar.xz mirror://gentoo/texlive-module-tempora.doc-2016.tar.xz mirror://gentoo/texlive-module-tengwarscript.doc-2016.tar.xz mirror://gentoo/texlive-module-tfrupee.doc-2016.tar.xz mirror://gentoo/texlive-module-tinos.doc-2016.tar.xz mirror://gentoo/texlive-module-tpslifonts.doc-2016.tar.xz mirror://gentoo/texlive-module-trajan.doc-2016.tar.xz mirror://gentoo/texlive-module-txfontsb.doc-2016.tar.xz mirror://gentoo/texlive-module-typicons.doc-2016.tar.xz mirror://gentoo/texlive-module-universa.doc-2016.tar.xz mirror://gentoo/texlive-module-universalis.doc-2016.tar.xz mirror://gentoo/texlive-module-uppunctlm.doc-2016.tar.xz mirror://gentoo/texlive-module-urwchancal.doc-2016.tar.xz mirror://gentoo/texlive-module-venturisadf.doc-2016.tar.xz mirror://gentoo/texlive-module-wsuipa.doc-2016.tar.xz mirror://gentoo/texlive-module-xcharter.doc-2016.tar.xz mirror://gentoo/texlive-module-xits.doc-2016.tar.xz mirror://gentoo/texlive-module-yfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-yfonts-t1.doc-2016.tar.xz mirror://gentoo/texlive-module-yinit-otf.doc-2016.tar.xz mirror://gentoo/texlive-module-zlmtt.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-allrunes.source-2016.tar.xz mirror://gentoo/texlive-module-anonymouspro.source-2016.tar.xz mirror://gentoo/texlive-module-archaic.source-2016.tar.xz mirror://gentoo/texlive-module-arev.source-2016.tar.xz mirror://gentoo/texlive-module-asapsym.source-2016.tar.xz mirror://gentoo/texlive-module-ascii-font.source-2016.tar.xz mirror://gentoo/texlive-module-auncial-new.source-2016.tar.xz mirror://gentoo/texlive-module-b1encoding.source-2016.tar.xz mirror://gentoo/texlive-module-barcodes.source-2016.tar.xz mirror://gentoo/texlive-module-baskervald.source-2016.tar.xz mirror://gentoo/texlive-module-bbding.source-2016.tar.xz mirror://gentoo/texlive-module-bbm-macros.source-2016.tar.xz mirror://gentoo/texlive-module-bbold.source-2016.tar.xz mirror://gentoo/texlive-module-belleek.source-2016.tar.xz mirror://gentoo/texlive-module-bguq.source-2016.tar.xz mirror://gentoo/texlive-module-blacklettert1.source-2016.tar.xz mirror://gentoo/texlive-module-bookhands.source-2016.tar.xz mirror://gentoo/texlive-module-cantarell.source-2016.tar.xz mirror://gentoo/texlive-module-ccicons.source-2016.tar.xz mirror://gentoo/texlive-module-cfr-lm.source-2016.tar.xz mirror://gentoo/texlive-module-chivo.source-2016.tar.xz mirror://gentoo/texlive-module-cmbright.source-2016.tar.xz mirror://gentoo/texlive-module-cmll.source-2016.tar.xz mirror://gentoo/texlive-module-comfortaa.source-2016.tar.xz mirror://gentoo/texlive-module-cookingsymbols.source-2016.tar.xz mirror://gentoo/texlive-module-dingbat.source-2016.tar.xz mirror://gentoo/texlive-module-dozenal.source-2016.tar.xz mirror://gentoo/texlive-module-drm.source-2016.tar.xz mirror://gentoo/texlive-module-droid.source-2016.tar.xz mirror://gentoo/texlive-module-eco.source-2016.tar.xz mirror://gentoo/texlive-module-eiad-ltx.source-2016.tar.xz mirror://gentoo/texlive-module-electrum.source-2016.tar.xz mirror://gentoo/texlive-module-epsdice.source-2016.tar.xz mirror://gentoo/texlive-module-esrelation.source-2016.tar.xz mirror://gentoo/texlive-module-esvect.source-2016.tar.xz mirror://gentoo/texlive-module-eulervm.source-2016.tar.xz mirror://gentoo/texlive-module-fdsymbol.source-2016.tar.xz mirror://gentoo/texlive-module-fetamont.source-2016.tar.xz mirror://gentoo/texlive-module-feyn.source-2016.tar.xz mirror://gentoo/texlive-module-fge.source-2016.tar.xz mirror://gentoo/texlive-module-fourier.source-2016.tar.xz mirror://gentoo/texlive-module-gentium-tug.source-2016.tar.xz mirror://gentoo/texlive-module-gnu-freefont.source-2016.tar.xz mirror://gentoo/texlive-module-gothic.source-2016.tar.xz mirror://gentoo/texlive-module-hfoldsty.source-2016.tar.xz mirror://gentoo/texlive-module-lato.source-2016.tar.xz mirror://gentoo/texlive-module-libris.source-2016.tar.xz mirror://gentoo/texlive-module-linearA.source-2016.tar.xz mirror://gentoo/texlive-module-lxfonts.source-2016.tar.xz mirror://gentoo/texlive-module-mdsymbol.source-2016.tar.xz mirror://gentoo/texlive-module-miama.source-2016.tar.xz mirror://gentoo/texlive-module-mnsymbol.source-2016.tar.xz mirror://gentoo/texlive-module-nkarta.source-2016.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.source-2016.tar.xz mirror://gentoo/texlive-module-oinuit.source-2016.tar.xz mirror://gentoo/texlive-module-opensans.source-2016.tar.xz mirror://gentoo/texlive-module-pacioli.source-2016.tar.xz mirror://gentoo/texlive-module-phaistos.source-2016.tar.xz mirror://gentoo/texlive-module-romande.source-2016.tar.xz mirror://gentoo/texlive-module-rosario.source-2016.tar.xz mirror://gentoo/texlive-module-sauterfonts.source-2016.tar.xz mirror://gentoo/texlive-module-skull.source-2016.tar.xz mirror://gentoo/texlive-module-staves.source-2016.tar.xz mirror://gentoo/texlive-module-stix.source-2016.tar.xz mirror://gentoo/texlive-module-svrsymbols.source-2016.tar.xz mirror://gentoo/texlive-module-tengwarscript.source-2016.tar.xz mirror://gentoo/texlive-module-tfrupee.source-2016.tar.xz mirror://gentoo/texlive-module-tpslifonts.source-2016.tar.xz mirror://gentoo/texlive-module-trajan.source-2016.tar.xz mirror://gentoo/texlive-module-txfontsb.source-2016.tar.xz mirror://gentoo/texlive-module-universa.source-2016.tar.xz mirror://gentoo/texlive-module-venturisadf.source-2016.tar.xz mirror://gentoo/texlive-module-xits.source-2016.tar.xz mirror://gentoo/texlive-module-yfonts.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=a34b1a84972cdc91b3283011dc8cff81
+_md5_=15c7996ef0fd99f792add8bf41e468fa
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2016 b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2016
index 45dd3b060a46..bbc92d2bd3ba 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Recommended fonts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !=dev-texlive/texlive-basic-2007* !<dev-texlive/texlive-fontsextra-2010 !<dev-texlive/texlive-latexrecommended-2014 dev-texlive/texlive-genericrecommended >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-avantgar-2016.tar.xz mirror://gentoo/texlive-module-bookman-2016.tar.xz mirror://gentoo/texlive-module-charter-2016.tar.xz mirror://gentoo/texlive-module-cm-super-2016.tar.xz mirror://gentoo/texlive-module-cmextra-2016.tar.xz mirror://gentoo/texlive-module-courier-2016.tar.xz mirror://gentoo/texlive-module-ec-2016.tar.xz mirror://gentoo/texlive-module-euro-2016.tar.xz mirror://gentoo/texlive-module-euro-ce-2016.tar.xz mirror://gentoo/texlive-module-eurosym-2016.tar.xz mirror://gentoo/texlive-module-fpl-2016.tar.xz mirror://gentoo/texlive-module-helvetic-2016.tar.xz mirror://gentoo/texlive-module-lm-2016.tar.xz mirror://gentoo/texlive-module-lm-math-2016.tar.xz mirror://gentoo/texlive-module-marvosym-2016.tar.xz mirror://gentoo/texlive-module-mathpazo-2016.tar.xz mirror://gentoo/texlive-module-manfnt-font-2016.tar.xz mirror://gentoo/texlive-module-mflogo-font-2016.tar.xz mirror://gentoo/texlive-module-ncntrsbk-2016.tar.xz mirror://gentoo/texlive-module-palatino-2016.tar.xz mirror://gentoo/texlive-module-pxfonts-2016.tar.xz mirror://gentoo/texlive-module-rsfs-2016.tar.xz mirror://gentoo/texlive-module-symbol-2016.tar.xz mirror://gentoo/texlive-module-tex-gyre-2016.tar.xz mirror://gentoo/texlive-module-tex-gyre-math-2016.tar.xz mirror://gentoo/texlive-module-times-2016.tar.xz mirror://gentoo/texlive-module-tipa-2016.tar.xz mirror://gentoo/texlive-module-txfonts-2016.tar.xz mirror://gentoo/texlive-module-utopia-2016.tar.xz mirror://gentoo/texlive-module-wasy-2016.tar.xz mirror://gentoo/texlive-module-wasy2-ps-2016.tar.xz mirror://gentoo/texlive-module-wasysym-2016.tar.xz mirror://gentoo/texlive-module-zapfchan-2016.tar.xz mirror://gentoo/texlive-module-zapfding-2016.tar.xz mirror://gentoo/texlive-module-collection-fontsrecommended-2016.tar.xz doc? ( mirror://gentoo/texlive-module-charter.doc-2016.tar.xz mirror://gentoo/texlive-module-cm-super.doc-2016.tar.xz mirror://gentoo/texlive-module-ec.doc-2016.tar.xz mirror://gentoo/texlive-module-euro.doc-2016.tar.xz mirror://gentoo/texlive-module-euro-ce.doc-2016.tar.xz mirror://gentoo/texlive-module-eurosym.doc-2016.tar.xz mirror://gentoo/texlive-module-fpl.doc-2016.tar.xz mirror://gentoo/texlive-module-lm.doc-2016.tar.xz mirror://gentoo/texlive-module-lm-math.doc-2016.tar.xz mirror://gentoo/texlive-module-marvosym.doc-2016.tar.xz mirror://gentoo/texlive-module-mathpazo.doc-2016.tar.xz mirror://gentoo/texlive-module-mflogo-font.doc-2016.tar.xz mirror://gentoo/texlive-module-pxfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-rsfs.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-gyre.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.doc-2016.tar.xz mirror://gentoo/texlive-module-tipa.doc-2016.tar.xz mirror://gentoo/texlive-module-txfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-utopia.doc-2016.tar.xz mirror://gentoo/texlive-module-wasy.doc-2016.tar.xz mirror://gentoo/texlive-module-wasy2-ps.doc-2016.tar.xz mirror://gentoo/texlive-module-wasysym.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-euro.source-2016.tar.xz mirror://gentoo/texlive-module-fpl.source-2016.tar.xz mirror://gentoo/texlive-module-lm.source-2016.tar.xz mirror://gentoo/texlive-module-marvosym.source-2016.tar.xz mirror://gentoo/texlive-module-mathpazo.source-2016.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.source-2016.tar.xz mirror://gentoo/texlive-module-wasysym.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=ed9b73bae19403d378af669899aaab02
+_md5_=fc5d1d70856baa5f50524039ad6ac7f2
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontutils-2016 b/metadata/md5-cache/dev-texlive/texlive-fontutils-2016
index 9da5c73a3a17..a0c9b9ed4171 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontutils-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-fontutils-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Graphics and font utilities
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-psutils !<dev-texlive/texlive-fontsextra-2009 !<app-text/texlive-core-2013 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-accfonts-2016.tar.xz mirror://gentoo/texlive-module-afm2pl-2016.tar.xz mirror://gentoo/texlive-module-dosepsbin-2016.tar.xz mirror://gentoo/texlive-module-epstopdf-2016.tar.xz mirror://gentoo/texlive-module-fontware-2016.tar.xz mirror://gentoo/texlive-module-lcdftypetools-2016.tar.xz mirror://gentoo/texlive-module-metatype1-2016.tar.xz mirror://gentoo/texlive-module-ps2pk-2016.tar.xz mirror://gentoo/texlive-module-pstools-2016.tar.xz mirror://gentoo/texlive-module-psutils-2016.tar.xz mirror://gentoo/texlive-module-dvipsconfig-2016.tar.xz mirror://gentoo/texlive-module-fontinst-2016.tar.xz mirror://gentoo/texlive-module-fontools-2016.tar.xz mirror://gentoo/texlive-module-mf2pt1-2016.tar.xz mirror://gentoo/texlive-module-t1utils-2016.tar.xz mirror://gentoo/texlive-module-collection-fontutils-2016.tar.xz doc? ( mirror://gentoo/texlive-module-accfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-afm2pl.doc-2016.tar.xz mirror://gentoo/texlive-module-dosepsbin.doc-2016.tar.xz mirror://gentoo/texlive-module-epstopdf.doc-2016.tar.xz mirror://gentoo/texlive-module-fontware.doc-2016.tar.xz mirror://gentoo/texlive-module-lcdftypetools.doc-2016.tar.xz mirror://gentoo/texlive-module-ps2pk.doc-2016.tar.xz mirror://gentoo/texlive-module-pstools.doc-2016.tar.xz mirror://gentoo/texlive-module-psutils.doc-2016.tar.xz mirror://gentoo/texlive-module-fontinst.doc-2016.tar.xz mirror://gentoo/texlive-module-fontools.doc-2016.tar.xz mirror://gentoo/texlive-module-mf2pt1.doc-2016.tar.xz mirror://gentoo/texlive-module-t1utils.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-dosepsbin.source-2016.tar.xz mirror://gentoo/texlive-module-metatype1.source-2016.tar.xz mirror://gentoo/texlive-module-fontinst.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=0da9d4f0ec0db993a95c0305b26a3c0e
+_md5_=63f042c1849a9edc814f66e354ce45e9
diff --git a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2016 b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2016
index b66f9dde7dd0..409af122c6a1 100644
--- a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Additional formats
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LPPL-1.3 public-domain TeX
 RDEPEND=>=dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-latex-2008 dev-texlive/texlive-xetex >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-edmac-2016.tar.xz mirror://gentoo/texlive-module-eplain-2016.tar.xz mirror://gentoo/texlive-module-lollipop-2016.tar.xz mirror://gentoo/texlive-module-mltex-2016.tar.xz mirror://gentoo/texlive-module-psizzl-2016.tar.xz mirror://gentoo/texlive-module-startex-2016.tar.xz mirror://gentoo/texlive-module-texsis-2016.tar.xz mirror://gentoo/texlive-module-collection-formatsextra-2016.tar.xz doc? ( mirror://gentoo/texlive-module-edmac.doc-2016.tar.xz mirror://gentoo/texlive-module-eplain.doc-2016.tar.xz mirror://gentoo/texlive-module-lollipop.doc-2016.tar.xz mirror://gentoo/texlive-module-mltex.doc-2016.tar.xz mirror://gentoo/texlive-module-psizzl.doc-2016.tar.xz mirror://gentoo/texlive-module-startex.doc-2016.tar.xz mirror://gentoo/texlive-module-texsis.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-edmac.source-2016.tar.xz mirror://gentoo/texlive-module-eplain.source-2016.tar.xz mirror://gentoo/texlive-module-psizzl.source-2016.tar.xz mirror://gentoo/texlive-module-startex.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=9da3502302964fc707ce2a39251e78fd
+_md5_=7e20bd7adc3c90a5bc63d096440297c4
diff --git a/metadata/md5-cache/dev-texlive/texlive-games-2016 b/metadata/md5-cache/dev-texlive/texlive-games-2016
index 84859eeaf02d..08c3f7e0839f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-games-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-games-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Games typesetting
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2016 !<dev-texlive/texlive-latexextra-2009 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-bartel-chess-fonts-2016.tar.xz mirror://gentoo/texlive-module-chess-2016.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams-2016.tar.xz mirror://gentoo/texlive-module-chessboard-2016.tar.xz mirror://gentoo/texlive-module-chessfss-2016.tar.xz mirror://gentoo/texlive-module-crossword-2016.tar.xz mirror://gentoo/texlive-module-crosswrd-2016.tar.xz mirror://gentoo/texlive-module-egameps-2016.tar.xz mirror://gentoo/texlive-module-gamebook-2016.tar.xz mirror://gentoo/texlive-module-go-2016.tar.xz mirror://gentoo/texlive-module-hanoi-2016.tar.xz mirror://gentoo/texlive-module-havannah-2016.tar.xz mirror://gentoo/texlive-module-hexgame-2016.tar.xz mirror://gentoo/texlive-module-horoscop-2016.tar.xz mirror://gentoo/texlive-module-labyrinth-2016.tar.xz mirror://gentoo/texlive-module-logicpuzzle-2016.tar.xz mirror://gentoo/texlive-module-othello-2016.tar.xz mirror://gentoo/texlive-module-othelloboard-2016.tar.xz mirror://gentoo/texlive-module-pas-crosswords-2016.tar.xz mirror://gentoo/texlive-module-psgo-2016.tar.xz mirror://gentoo/texlive-module-reverxii-2016.tar.xz mirror://gentoo/texlive-module-rubik-2016.tar.xz mirror://gentoo/texlive-module-schwalbe-chess-2016.tar.xz mirror://gentoo/texlive-module-sgame-2016.tar.xz mirror://gentoo/texlive-module-skak-2016.tar.xz mirror://gentoo/texlive-module-skaknew-2016.tar.xz mirror://gentoo/texlive-module-soup-2016.tar.xz mirror://gentoo/texlive-module-sudoku-2016.tar.xz mirror://gentoo/texlive-module-sudokubundle-2016.tar.xz mirror://gentoo/texlive-module-xq-2016.tar.xz mirror://gentoo/texlive-module-xskak-2016.tar.xz mirror://gentoo/texlive-module-collection-games-2016.tar.xz doc? ( mirror://gentoo/texlive-module-bartel-chess-fonts.doc-2016.tar.xz mirror://gentoo/texlive-module-chess.doc-2016.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams.doc-2016.tar.xz mirror://gentoo/texlive-module-chessboard.doc-2016.tar.xz mirror://gentoo/texlive-module-chessfss.doc-2016.tar.xz mirror://gentoo/texlive-module-crossword.doc-2016.tar.xz mirror://gentoo/texlive-module-crosswrd.doc-2016.tar.xz mirror://gentoo/texlive-module-egameps.doc-2016.tar.xz mirror://gentoo/texlive-module-gamebook.doc-2016.tar.xz mirror://gentoo/texlive-module-go.doc-2016.tar.xz mirror://gentoo/texlive-module-havannah.doc-2016.tar.xz mirror://gentoo/texlive-module-hexgame.doc-2016.tar.xz mirror://gentoo/texlive-module-horoscop.doc-2016.tar.xz mirror://gentoo/texlive-module-labyrinth.doc-2016.tar.xz mirror://gentoo/texlive-module-logicpuzzle.doc-2016.tar.xz mirror://gentoo/texlive-module-othello.doc-2016.tar.xz mirror://gentoo/texlive-module-othelloboard.doc-2016.tar.xz mirror://gentoo/texlive-module-pas-crosswords.doc-2016.tar.xz mirror://gentoo/texlive-module-psgo.doc-2016.tar.xz mirror://gentoo/texlive-module-reverxii.doc-2016.tar.xz mirror://gentoo/texlive-module-rubik.doc-2016.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.doc-2016.tar.xz mirror://gentoo/texlive-module-sgame.doc-2016.tar.xz mirror://gentoo/texlive-module-skak.doc-2016.tar.xz mirror://gentoo/texlive-module-skaknew.doc-2016.tar.xz mirror://gentoo/texlive-module-soup.doc-2016.tar.xz mirror://gentoo/texlive-module-sudoku.doc-2016.tar.xz mirror://gentoo/texlive-module-sudokubundle.doc-2016.tar.xz mirror://gentoo/texlive-module-xq.doc-2016.tar.xz mirror://gentoo/texlive-module-xskak.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-chess-problem-diagrams.source-2016.tar.xz mirror://gentoo/texlive-module-chessboard.source-2016.tar.xz mirror://gentoo/texlive-module-chessfss.source-2016.tar.xz mirror://gentoo/texlive-module-crossword.source-2016.tar.xz mirror://gentoo/texlive-module-crosswrd.source-2016.tar.xz mirror://gentoo/texlive-module-gamebook.source-2016.tar.xz mirror://gentoo/texlive-module-go.source-2016.tar.xz mirror://gentoo/texlive-module-havannah.source-2016.tar.xz mirror://gentoo/texlive-module-horoscop.source-2016.tar.xz mirror://gentoo/texlive-module-rubik.source-2016.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.source-2016.tar.xz mirror://gentoo/texlive-module-soup.source-2016.tar.xz mirror://gentoo/texlive-module-sudoku.source-2016.tar.xz mirror://gentoo/texlive-module-sudokubundle.source-2016.tar.xz mirror://gentoo/texlive-module-xskak.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=95bee43adba52118100fdf14adf2ec43
+_md5_=d1d18da12c20ef3a10ca6839b92e1596
diff --git a/metadata/md5-cache/dev-texlive/texlive-genericextra-2016 b/metadata/md5-cache/dev-texlive/texlive-genericextra-2016
index 50a21a91c6b2..02dcc1c0a7c0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-genericextra-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-genericextra-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Generic additional packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-latexextra-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abbr-2016.tar.xz mirror://gentoo/texlive-module-abstyles-2016.tar.xz mirror://gentoo/texlive-module-autoaligne-2016.tar.xz mirror://gentoo/texlive-module-barr-2016.tar.xz mirror://gentoo/texlive-module-bitelist-2016.tar.xz mirror://gentoo/texlive-module-borceux-2016.tar.xz mirror://gentoo/texlive-module-c-pascal-2016.tar.xz mirror://gentoo/texlive-module-catcodes-2016.tar.xz mirror://gentoo/texlive-module-chronosys-2016.tar.xz mirror://gentoo/texlive-module-colorsep-2016.tar.xz mirror://gentoo/texlive-module-dinat-2016.tar.xz mirror://gentoo/texlive-module-dirtree-2016.tar.xz mirror://gentoo/texlive-module-docbytex-2016.tar.xz mirror://gentoo/texlive-module-dowith-2016.tar.xz mirror://gentoo/texlive-module-eijkhout-2016.tar.xz mirror://gentoo/texlive-module-encxvlna-2016.tar.xz mirror://gentoo/texlive-module-epigram-2016.tar.xz mirror://gentoo/texlive-module-fenixpar-2016.tar.xz mirror://gentoo/texlive-module-fltpoint-2016.tar.xz mirror://gentoo/texlive-module-fntproof-2016.tar.xz mirror://gentoo/texlive-module-gates-2016.tar.xz mirror://gentoo/texlive-module-gobble-2016.tar.xz mirror://gentoo/texlive-module-gtl-2016.tar.xz mirror://gentoo/texlive-module-ifetex-2016.tar.xz mirror://gentoo/texlive-module-iftex-2016.tar.xz mirror://gentoo/texlive-module-insbox-2016.tar.xz mirror://gentoo/texlive-module-lambda-lists-2016.tar.xz mirror://gentoo/texlive-module-langcode-2016.tar.xz mirror://gentoo/texlive-module-lecturer-2016.tar.xz mirror://gentoo/texlive-module-librarian-2016.tar.xz mirror://gentoo/texlive-module-listofitems-2016.tar.xz mirror://gentoo/texlive-module-mathdots-2016.tar.xz mirror://gentoo/texlive-module-metatex-2016.tar.xz mirror://gentoo/texlive-module-midnight-2016.tar.xz mirror://gentoo/texlive-module-navigator-2016.tar.xz mirror://gentoo/texlive-module-ofs-2016.tar.xz mirror://gentoo/texlive-module-olsak-misc-2016.tar.xz mirror://gentoo/texlive-module-pdf-trans-2016.tar.xz mirror://gentoo/texlive-module-plainpkg-2016.tar.xz mirror://gentoo/texlive-module-randomlist-2016.tar.xz mirror://gentoo/texlive-module-schemata-2016.tar.xz mirror://gentoo/texlive-module-shade-2016.tar.xz mirror://gentoo/texlive-module-systeme-2016.tar.xz mirror://gentoo/texlive-module-tabto-generic-2016.tar.xz mirror://gentoo/texlive-module-termmenu-2016.tar.xz mirror://gentoo/texlive-module-tracklang-2016.tar.xz mirror://gentoo/texlive-module-texapi-2016.tar.xz mirror://gentoo/texlive-module-upca-2016.tar.xz mirror://gentoo/texlive-module-xlop-2016.tar.xz mirror://gentoo/texlive-module-yax-2016.tar.xz mirror://gentoo/texlive-module-collection-genericextra-2016.tar.xz doc? ( mirror://gentoo/texlive-module-abbr.doc-2016.tar.xz mirror://gentoo/texlive-module-abstyles.doc-2016.tar.xz mirror://gentoo/texlive-module-autoaligne.doc-2016.tar.xz mirror://gentoo/texlive-module-barr.doc-2016.tar.xz mirror://gentoo/texlive-module-bitelist.doc-2016.tar.xz mirror://gentoo/texlive-module-borceux.doc-2016.tar.xz mirror://gentoo/texlive-module-c-pascal.doc-2016.tar.xz mirror://gentoo/texlive-module-catcodes.doc-2016.tar.xz mirror://gentoo/texlive-module-chronosys.doc-2016.tar.xz mirror://gentoo/texlive-module-dinat.doc-2016.tar.xz mirror://gentoo/texlive-module-dirtree.doc-2016.tar.xz mirror://gentoo/texlive-module-docbytex.doc-2016.tar.xz mirror://gentoo/texlive-module-dowith.doc-2016.tar.xz mirror://gentoo/texlive-module-encxvlna.doc-2016.tar.xz mirror://gentoo/texlive-module-fenixpar.doc-2016.tar.xz mirror://gentoo/texlive-module-fltpoint.doc-2016.tar.xz mirror://gentoo/texlive-module-fntproof.doc-2016.tar.xz mirror://gentoo/texlive-module-gates.doc-2016.tar.xz mirror://gentoo/texlive-module-gobble.doc-2016.tar.xz mirror://gentoo/texlive-module-gtl.doc-2016.tar.xz mirror://gentoo/texlive-module-ifetex.doc-2016.tar.xz mirror://gentoo/texlive-module-iftex.doc-2016.tar.xz mirror://gentoo/texlive-module-insbox.doc-2016.tar.xz mirror://gentoo/texlive-module-lambda-lists.doc-2016.tar.xz mirror://gentoo/texlive-module-langcode.doc-2016.tar.xz mirror://gentoo/texlive-module-lecturer.doc-2016.tar.xz mirror://gentoo/texlive-module-librarian.doc-2016.tar.xz mirror://gentoo/texlive-module-listofitems.doc-2016.tar.xz mirror://gentoo/texlive-module-mathdots.doc-2016.tar.xz mirror://gentoo/texlive-module-metatex.doc-2016.tar.xz mirror://gentoo/texlive-module-midnight.doc-2016.tar.xz mirror://gentoo/texlive-module-navigator.doc-2016.tar.xz mirror://gentoo/texlive-module-ofs.doc-2016.tar.xz mirror://gentoo/texlive-module-olsak-misc.doc-2016.tar.xz mirror://gentoo/texlive-module-pdf-trans.doc-2016.tar.xz mirror://gentoo/texlive-module-plainpkg.doc-2016.tar.xz mirror://gentoo/texlive-module-randomlist.doc-2016.tar.xz mirror://gentoo/texlive-module-schemata.doc-2016.tar.xz mirror://gentoo/texlive-module-shade.doc-2016.tar.xz mirror://gentoo/texlive-module-systeme.doc-2016.tar.xz mirror://gentoo/texlive-module-termmenu.doc-2016.tar.xz mirror://gentoo/texlive-module-tracklang.doc-2016.tar.xz mirror://gentoo/texlive-module-texapi.doc-2016.tar.xz mirror://gentoo/texlive-module-upca.doc-2016.tar.xz mirror://gentoo/texlive-module-xlop.doc-2016.tar.xz mirror://gentoo/texlive-module-yax.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-bitelist.source-2016.tar.xz mirror://gentoo/texlive-module-catcodes.source-2016.tar.xz mirror://gentoo/texlive-module-dirtree.source-2016.tar.xz mirror://gentoo/texlive-module-dowith.source-2016.tar.xz mirror://gentoo/texlive-module-fltpoint.source-2016.tar.xz mirror://gentoo/texlive-module-gobble.source-2016.tar.xz mirror://gentoo/texlive-module-gtl.source-2016.tar.xz mirror://gentoo/texlive-module-ifetex.source-2016.tar.xz mirror://gentoo/texlive-module-langcode.source-2016.tar.xz mirror://gentoo/texlive-module-mathdots.source-2016.tar.xz mirror://gentoo/texlive-module-plainpkg.source-2016.tar.xz mirror://gentoo/texlive-module-randomlist.source-2016.tar.xz mirror://gentoo/texlive-module-schemata.source-2016.tar.xz mirror://gentoo/texlive-module-termmenu.source-2016.tar.xz mirror://gentoo/texlive-module-tracklang.source-2016.tar.xz mirror://gentoo/texlive-module-xlop.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4146332b34f5e5ad3b7806e0f9ce4344
+_md5_=1ccaec52de586e35ba34b7f323672b99
diff --git a/metadata/md5-cache/dev-texlive/texlive-genericrecommended-2016 b/metadata/md5-cache/dev-texlive/texlive-genericrecommended-2016
index b59847b7dc1d..41d30637b7ca 100644
--- a/metadata/md5-cache/dev-texlive/texlive-genericrecommended-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-genericrecommended-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Generic recommended packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !=dev-texlive/texlive-basic-2007* !<dev-texlive/texlive-texinfo-2009 !<dev-texlive/texlive-latexextra-2010 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-apnum-2016.tar.xz mirror://gentoo/texlive-module-epsf-2016.tar.xz mirror://gentoo/texlive-module-fontname-2016.tar.xz mirror://gentoo/texlive-module-genmisc-2016.tar.xz mirror://gentoo/texlive-module-kastrup-2016.tar.xz mirror://gentoo/texlive-module-multido-2016.tar.xz mirror://gentoo/texlive-module-path-2016.tar.xz mirror://gentoo/texlive-module-tex-ps-2016.tar.xz mirror://gentoo/texlive-module-ulem-2016.tar.xz mirror://gentoo/texlive-module-collection-genericrecommended-2016.tar.xz doc? ( mirror://gentoo/texlive-module-apnum.doc-2016.tar.xz mirror://gentoo/texlive-module-epsf.doc-2016.tar.xz mirror://gentoo/texlive-module-fontname.doc-2016.tar.xz mirror://gentoo/texlive-module-kastrup.doc-2016.tar.xz mirror://gentoo/texlive-module-multido.doc-2016.tar.xz mirror://gentoo/texlive-module-path.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-ps.doc-2016.tar.xz mirror://gentoo/texlive-module-ulem.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-kastrup.source-2016.tar.xz mirror://gentoo/texlive-module-multido.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=dfbef602185cda5f27f62e50d0be9b09
+_md5_=5d4e66f406180225af0f14b2fbf89f59
diff --git a/metadata/md5-cache/dev-texlive/texlive-humanities-2016 b/metadata/md5-cache/dev-texlive/texlive-humanities-2016
index b9810929352b..9ed98882de9a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-humanities-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-humanities-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Humanities packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-latex-2016 !dev-tex/lineno >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adtrees-2016.tar.xz mirror://gentoo/texlive-module-bibleref-2016.tar.xz mirror://gentoo/texlive-module-bibleref-lds-2016.tar.xz mirror://gentoo/texlive-module-bibleref-mouth-2016.tar.xz mirror://gentoo/texlive-module-bibleref-parse-2016.tar.xz mirror://gentoo/texlive-module-covington-2016.tar.xz mirror://gentoo/texlive-module-diadia-2016.tar.xz mirror://gentoo/texlive-module-dramatist-2016.tar.xz mirror://gentoo/texlive-module-dvgloss-2016.tar.xz mirror://gentoo/texlive-module-ecltree-2016.tar.xz mirror://gentoo/texlive-module-edfnotes-2016.tar.xz mirror://gentoo/texlive-module-ednotes-2016.tar.xz mirror://gentoo/texlive-module-eledform-2016.tar.xz mirror://gentoo/texlive-module-eledmac-2016.tar.xz mirror://gentoo/texlive-module-expex-2016.tar.xz mirror://gentoo/texlive-module-gb4e-2016.tar.xz mirror://gentoo/texlive-module-gmverse-2016.tar.xz mirror://gentoo/texlive-module-jura-2016.tar.xz mirror://gentoo/texlive-module-juraabbrev-2016.tar.xz mirror://gentoo/texlive-module-juramisc-2016.tar.xz mirror://gentoo/texlive-module-jurarsp-2016.tar.xz mirror://gentoo/texlive-module-ledmac-2016.tar.xz mirror://gentoo/texlive-module-leipzig-2016.tar.xz mirror://gentoo/texlive-module-lexikon-2016.tar.xz mirror://gentoo/texlive-module-lexref-2016.tar.xz mirror://gentoo/texlive-module-ling-macros-2016.tar.xz mirror://gentoo/texlive-module-linguex-2016.tar.xz mirror://gentoo/texlive-module-liturg-2016.tar.xz mirror://gentoo/texlive-module-metrix-2016.tar.xz mirror://gentoo/texlive-module-parallel-2016.tar.xz mirror://gentoo/texlive-module-parrun-2016.tar.xz mirror://gentoo/texlive-module-phonrule-2016.tar.xz mirror://gentoo/texlive-module-plari-2016.tar.xz mirror://gentoo/texlive-module-play-2016.tar.xz mirror://gentoo/texlive-module-poemscol-2016.tar.xz mirror://gentoo/texlive-module-poetrytex-2016.tar.xz mirror://gentoo/texlive-module-qobitree-2016.tar.xz mirror://gentoo/texlive-module-qtree-2016.tar.xz mirror://gentoo/texlive-module-reledmac-2016.tar.xz mirror://gentoo/texlive-module-rrgtrees-2016.tar.xz mirror://gentoo/texlive-module-rtklage-2016.tar.xz mirror://gentoo/texlive-module-screenplay-2016.tar.xz mirror://gentoo/texlive-module-screenplay-pkg-2016.tar.xz mirror://gentoo/texlive-module-sides-2016.tar.xz mirror://gentoo/texlive-module-stage-2016.tar.xz mirror://gentoo/texlive-module-textglos-2016.tar.xz mirror://gentoo/texlive-module-thalie-2016.tar.xz mirror://gentoo/texlive-module-tree-dvips-2016.tar.xz mirror://gentoo/texlive-module-verse-2016.tar.xz mirror://gentoo/texlive-module-xyling-2016.tar.xz mirror://gentoo/texlive-module-collection-humanities-2016.tar.xz doc? ( mirror://gentoo/texlive-module-adtrees.doc-2016.tar.xz mirror://gentoo/texlive-module-bibleref.doc-2016.tar.xz mirror://gentoo/texlive-module-bibleref-lds.doc-2016.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.doc-2016.tar.xz mirror://gentoo/texlive-module-bibleref-parse.doc-2016.tar.xz mirror://gentoo/texlive-module-covington.doc-2016.tar.xz mirror://gentoo/texlive-module-diadia.doc-2016.tar.xz mirror://gentoo/texlive-module-dramatist.doc-2016.tar.xz mirror://gentoo/texlive-module-dvgloss.doc-2016.tar.xz mirror://gentoo/texlive-module-ecltree.doc-2016.tar.xz mirror://gentoo/texlive-module-edfnotes.doc-2016.tar.xz mirror://gentoo/texlive-module-ednotes.doc-2016.tar.xz mirror://gentoo/texlive-module-eledform.doc-2016.tar.xz mirror://gentoo/texlive-module-eledmac.doc-2016.tar.xz mirror://gentoo/texlive-module-expex.doc-2016.tar.xz mirror://gentoo/texlive-module-gb4e.doc-2016.tar.xz mirror://gentoo/texlive-module-gmverse.doc-2016.tar.xz mirror://gentoo/texlive-module-jura.doc-2016.tar.xz mirror://gentoo/texlive-module-juraabbrev.doc-2016.tar.xz mirror://gentoo/texlive-module-juramisc.doc-2016.tar.xz mirror://gentoo/texlive-module-jurarsp.doc-2016.tar.xz mirror://gentoo/texlive-module-ledmac.doc-2016.tar.xz mirror://gentoo/texlive-module-leipzig.doc-2016.tar.xz mirror://gentoo/texlive-module-lexikon.doc-2016.tar.xz mirror://gentoo/texlive-module-lexref.doc-2016.tar.xz mirror://gentoo/texlive-module-ling-macros.doc-2016.tar.xz mirror://gentoo/texlive-module-linguex.doc-2016.tar.xz mirror://gentoo/texlive-module-liturg.doc-2016.tar.xz mirror://gentoo/texlive-module-metrix.doc-2016.tar.xz mirror://gentoo/texlive-module-parallel.doc-2016.tar.xz mirror://gentoo/texlive-module-parrun.doc-2016.tar.xz mirror://gentoo/texlive-module-phonrule.doc-2016.tar.xz mirror://gentoo/texlive-module-plari.doc-2016.tar.xz mirror://gentoo/texlive-module-play.doc-2016.tar.xz mirror://gentoo/texlive-module-poemscol.doc-2016.tar.xz mirror://gentoo/texlive-module-poetrytex.doc-2016.tar.xz mirror://gentoo/texlive-module-qobitree.doc-2016.tar.xz mirror://gentoo/texlive-module-qtree.doc-2016.tar.xz mirror://gentoo/texlive-module-reledmac.doc-2016.tar.xz mirror://gentoo/texlive-module-rrgtrees.doc-2016.tar.xz mirror://gentoo/texlive-module-rtklage.doc-2016.tar.xz mirror://gentoo/texlive-module-screenplay.doc-2016.tar.xz mirror://gentoo/texlive-module-screenplay-pkg.doc-2016.tar.xz mirror://gentoo/texlive-module-sides.doc-2016.tar.xz mirror://gentoo/texlive-module-stage.doc-2016.tar.xz mirror://gentoo/texlive-module-textglos.doc-2016.tar.xz mirror://gentoo/texlive-module-thalie.doc-2016.tar.xz mirror://gentoo/texlive-module-tree-dvips.doc-2016.tar.xz mirror://gentoo/texlive-module-verse.doc-2016.tar.xz mirror://gentoo/texlive-module-xyling.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-bibleref.source-2016.tar.xz mirror://gentoo/texlive-module-bibleref-lds.source-2016.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.source-2016.tar.xz mirror://gentoo/texlive-module-dramatist.source-2016.tar.xz mirror://gentoo/texlive-module-dvgloss.source-2016.tar.xz mirror://gentoo/texlive-module-edfnotes.source-2016.tar.xz mirror://gentoo/texlive-module-eledform.source-2016.tar.xz mirror://gentoo/texlive-module-eledmac.source-2016.tar.xz mirror://gentoo/texlive-module-jura.source-2016.tar.xz mirror://gentoo/texlive-module-juraabbrev.source-2016.tar.xz mirror://gentoo/texlive-module-jurarsp.source-2016.tar.xz mirror://gentoo/texlive-module-ledmac.source-2016.tar.xz mirror://gentoo/texlive-module-leipzig.source-2016.tar.xz mirror://gentoo/texlive-module-liturg.source-2016.tar.xz mirror://gentoo/texlive-module-metrix.source-2016.tar.xz mirror://gentoo/texlive-module-parallel.source-2016.tar.xz mirror://gentoo/texlive-module-parrun.source-2016.tar.xz mirror://gentoo/texlive-module-plari.source-2016.tar.xz mirror://gentoo/texlive-module-play.source-2016.tar.xz mirror://gentoo/texlive-module-poemscol.source-2016.tar.xz mirror://gentoo/texlive-module-poetrytex.source-2016.tar.xz mirror://gentoo/texlive-module-reledmac.source-2016.tar.xz mirror://gentoo/texlive-module-rrgtrees.source-2016.tar.xz mirror://gentoo/texlive-module-screenplay.source-2016.tar.xz mirror://gentoo/texlive-module-textglos.source-2016.tar.xz mirror://gentoo/texlive-module-thalie.source-2016.tar.xz mirror://gentoo/texlive-module-verse.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=2db45e22a20a15f99a08b4864c2d7768
+_md5_=c3e9bdf93bc86dfd0fb6b35b5e4b2be6
diff --git a/metadata/md5-cache/dev-texlive/texlive-langafrican-2016 b/metadata/md5-cache/dev-texlive/texlive-langafrican-2016
index 55db598a85c7..dba32340ff9c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langafrican-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langafrican-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive African scripts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2
 RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-ethiop-2016.tar.xz mirror://gentoo/texlive-module-ethiop-t1-2016.tar.xz mirror://gentoo/texlive-module-fc-2016.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic-2016.tar.xz mirror://gentoo/texlive-module-collection-langafrican-2016.tar.xz doc? ( mirror://gentoo/texlive-module-ethiop.doc-2016.tar.xz mirror://gentoo/texlive-module-ethiop-t1.doc-2016.tar.xz mirror://gentoo/texlive-module-fc.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-ethiop.source-2016.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=f37c93ce5fc4c8a7faee9cffe50c5b86
+_md5_=4de55c5484704215c564ec1133974973
diff --git a/metadata/md5-cache/dev-texlive/texlive-langarabic-2016 b/metadata/md5-cache/dev-texlive/texlive-langarabic-2016
index c8808cf482b8..1620c229c0ce 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langarabic-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langarabic-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Arabic
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LPPL-1.3 OFL public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-langarab !<dev-texlive/texlive-xetex-2016 !<dev-texlive/texlive-publishers-2013 !dev-texlive/texlive-documentation-arabic !<dev-texlive/texlive-latexextra-2013 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amiri-2016.tar.xz mirror://gentoo/texlive-module-arabi-2016.tar.xz mirror://gentoo/texlive-module-arabi-add-2016.tar.xz mirror://gentoo/texlive-module-arabluatex-2016.tar.xz mirror://gentoo/texlive-module-arabtex-2016.tar.xz mirror://gentoo/texlive-module-bidi-2016.tar.xz mirror://gentoo/texlive-module-bidihl-2016.tar.xz mirror://gentoo/texlive-module-dad-2016.tar.xz mirror://gentoo/texlive-module-ghab-2016.tar.xz mirror://gentoo/texlive-module-hyphen-arabic-2016.tar.xz mirror://gentoo/texlive-module-hyphen-farsi-2016.tar.xz mirror://gentoo/texlive-module-imsproc-2016.tar.xz mirror://gentoo/texlive-module-lshort-persian-2016.tar.xz mirror://gentoo/texlive-module-persian-bib-2016.tar.xz mirror://gentoo/texlive-module-simurgh-2016.tar.xz mirror://gentoo/texlive-module-tram-2016.tar.xz mirror://gentoo/texlive-module-xepersian-2016.tar.xz mirror://gentoo/texlive-module-collection-langarabic-2016.tar.xz doc? ( mirror://gentoo/texlive-module-amiri.doc-2016.tar.xz mirror://gentoo/texlive-module-arabi.doc-2016.tar.xz mirror://gentoo/texlive-module-arabi-add.doc-2016.tar.xz mirror://gentoo/texlive-module-arabluatex.doc-2016.tar.xz mirror://gentoo/texlive-module-arabtex.doc-2016.tar.xz mirror://gentoo/texlive-module-bidi.doc-2016.tar.xz mirror://gentoo/texlive-module-bidihl.doc-2016.tar.xz mirror://gentoo/texlive-module-dad.doc-2016.tar.xz mirror://gentoo/texlive-module-ghab.doc-2016.tar.xz mirror://gentoo/texlive-module-imsproc.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-persian.doc-2016.tar.xz mirror://gentoo/texlive-module-persian-bib.doc-2016.tar.xz mirror://gentoo/texlive-module-simurgh.doc-2016.tar.xz mirror://gentoo/texlive-module-tram.doc-2016.tar.xz mirror://gentoo/texlive-module-xepersian.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-arabluatex.source-2016.tar.xz mirror://gentoo/texlive-module-bidi.source-2016.tar.xz mirror://gentoo/texlive-module-xepersian.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=58342f68d34c62aea9d65ed2047ad7d8
+_md5_=affe33c0593137d5747dc4e739a921fe
diff --git a/metadata/md5-cache/dev-texlive/texlive-langchinese-2016 b/metadata/md5-cache/dev-texlive/texlive-langchinese-2016
index 673ece719ad2..f6c0ac7e686d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langchinese-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langchinese-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Chinese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2016 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arphic-2016.tar.xz mirror://gentoo/texlive-module-arphic-ttf-2016.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn-2016.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn-2016.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn-2016.tar.xz mirror://gentoo/texlive-module-cns-2016.tar.xz mirror://gentoo/texlive-module-ctex-2016.tar.xz mirror://gentoo/texlive-module-ctex-faq-2016.tar.xz mirror://gentoo/texlive-module-fandol-2016.tar.xz mirror://gentoo/texlive-module-hyphen-chinese-2016.tar.xz mirror://gentoo/texlive-module-impatient-cn-2016.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn-2016.tar.xz mirror://gentoo/texlive-module-lshort-chinese-2016.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn-2016.tar.xz mirror://gentoo/texlive-module-texproposal-2016.tar.xz mirror://gentoo/texlive-module-xpinyin-2016.tar.xz mirror://gentoo/texlive-module-zhmetrics-2016.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex-2016.tar.xz mirror://gentoo/texlive-module-zhnumber-2016.tar.xz mirror://gentoo/texlive-module-zhspacing-2016.tar.xz mirror://gentoo/texlive-module-collection-langchinese-2016.tar.xz doc? ( mirror://gentoo/texlive-module-arphic.doc-2016.tar.xz mirror://gentoo/texlive-module-arphic-ttf.doc-2016.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn.doc-2016.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn.doc-2016.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn.doc-2016.tar.xz mirror://gentoo/texlive-module-cns.doc-2016.tar.xz mirror://gentoo/texlive-module-ctex.doc-2016.tar.xz mirror://gentoo/texlive-module-ctex-faq.doc-2016.tar.xz mirror://gentoo/texlive-module-fandol.doc-2016.tar.xz mirror://gentoo/texlive-module-impatient-cn.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-chinese.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn.doc-2016.tar.xz mirror://gentoo/texlive-module-texproposal.doc-2016.tar.xz mirror://gentoo/texlive-module-xpinyin.doc-2016.tar.xz mirror://gentoo/texlive-module-zhmetrics.doc-2016.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex.doc-2016.tar.xz mirror://gentoo/texlive-module-zhnumber.doc-2016.tar.xz mirror://gentoo/texlive-module-zhspacing.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-ctex.source-2016.tar.xz mirror://gentoo/texlive-module-xpinyin.source-2016.tar.xz mirror://gentoo/texlive-module-zhmetrics.source-2016.tar.xz mirror://gentoo/texlive-module-zhnumber.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=c82f5700b91399c26bd1557ed4e9b671
+_md5_=77a504294a79a38cd4934478e1f7df77
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcjk-2016 b/metadata/md5-cache/dev-texlive/texlive-langcjk-2016
index 2bec09ff0b8b..092c70ec8072 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcjk-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langcjk-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Chinese/Japanese/Korean (base)
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2 GPL-3 LPPL-1.3 MIT
 RDEPEND=>=dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2010[cjk] >=dev-texlive/texlive-latex-2011 !!<dev-texlive/texlive-langcjk-2012 !dev-texlive/texlive-documentation-chinese !dev-texlive/texlive-documentation-korean !dev-texlive/texlive-documentation-japanese !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adobemapping-2016.tar.xz mirror://gentoo/texlive-module-c90-2016.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate-2016.tar.xz mirror://gentoo/texlive-module-cjkpunct-2016.tar.xz mirror://gentoo/texlive-module-dnp-2016.tar.xz mirror://gentoo/texlive-module-garuda-c90-2016.tar.xz mirror://gentoo/texlive-module-norasi-c90-2016.tar.xz mirror://gentoo/texlive-module-xcjk2uni-2016.tar.xz mirror://gentoo/texlive-module-zxjafont-2016.tar.xz mirror://gentoo/texlive-module-collection-langcjk-2016.tar.xz doc? ( mirror://gentoo/texlive-module-c90.doc-2016.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate.doc-2016.tar.xz mirror://gentoo/texlive-module-cjkpunct.doc-2016.tar.xz mirror://gentoo/texlive-module-xcjk2uni.doc-2016.tar.xz mirror://gentoo/texlive-module-zxjafont.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-c90.source-2016.tar.xz mirror://gentoo/texlive-module-cjkpunct.source-2016.tar.xz mirror://gentoo/texlive-module-garuda-c90.source-2016.tar.xz mirror://gentoo/texlive-module-norasi-c90.source-2016.tar.xz mirror://gentoo/texlive-module-xcjk2uni.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=ae7afbd09825b0b34d502347ba9b316b
+_md5_=cd5dd6dd7b02973ba1fc920cd007f532
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2016 b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2016
index bed17e2a15d1..c7701ce9fd21 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Cyrillic
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-latex-2016 !dev-texlive/texlive-documentation-ukrainian !dev-texlive/texlive-documentation-bulgarian !dev-texlive/texlive-documentation-russian !dev-texlive/texlive-documentation-mongolian !dev-texlive/texlive-langmongolian !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-documentation-serbian !<app-text/texlive-core-2013 !<dev-texlive/texlive-latexextra-2013 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-belarusian-2016.tar.xz mirror://gentoo/texlive-module-babel-bulgarian-2016.tar.xz mirror://gentoo/texlive-module-babel-russian-2016.tar.xz mirror://gentoo/texlive-module-babel-serbian-2016.tar.xz mirror://gentoo/texlive-module-babel-serbianc-2016.tar.xz mirror://gentoo/texlive-module-babel-ukrainian-2016.tar.xz mirror://gentoo/texlive-module-churchslavonic-2016.tar.xz mirror://gentoo/texlive-module-cmcyr-2016.tar.xz mirror://gentoo/texlive-module-cyrillic-2016.tar.xz mirror://gentoo/texlive-module-cyrillic-bin-2016.tar.xz mirror://gentoo/texlive-module-cyrplain-2016.tar.xz mirror://gentoo/texlive-module-disser-2016.tar.xz mirror://gentoo/texlive-module-eskd-2016.tar.xz mirror://gentoo/texlive-module-eskdx-2016.tar.xz mirror://gentoo/texlive-module-gost-2016.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-churchslavonic-2016.tar.xz mirror://gentoo/texlive-module-hyphen-mongolian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-russian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-serbian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-ukrainian-2016.tar.xz mirror://gentoo/texlive-module-lcyw-2016.tar.xz mirror://gentoo/texlive-module-lh-2016.tar.xz mirror://gentoo/texlive-module-lhcyr-2016.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian-2016.tar.xz mirror://gentoo/texlive-module-lshort-mongol-2016.tar.xz mirror://gentoo/texlive-module-lshort-russian-2016.tar.xz mirror://gentoo/texlive-module-lshort-ukr-2016.tar.xz mirror://gentoo/texlive-module-mongolian-babel-2016.tar.xz mirror://gentoo/texlive-module-montex-2016.tar.xz mirror://gentoo/texlive-module-mpman-ru-2016.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg-2016.tar.xz mirror://gentoo/texlive-module-ruhyphen-2016.tar.xz mirror://gentoo/texlive-module-russ-2016.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe-2016.tar.xz mirror://gentoo/texlive-module-serbian-date-lat-2016.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr-2016.tar.xz mirror://gentoo/texlive-module-serbian-lig-2016.tar.xz mirror://gentoo/texlive-module-t2-2016.tar.xz mirror://gentoo/texlive-module-texlive-ru-2016.tar.xz mirror://gentoo/texlive-module-texlive-sr-2016.tar.xz mirror://gentoo/texlive-module-ukrhyph-2016.tar.xz mirror://gentoo/texlive-module-collection-langcyrillic-2016.tar.xz doc? ( mirror://gentoo/texlive-module-babel-belarusian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-russian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-serbian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-serbianc.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.doc-2016.tar.xz mirror://gentoo/texlive-module-churchslavonic.doc-2016.tar.xz mirror://gentoo/texlive-module-cmcyr.doc-2016.tar.xz mirror://gentoo/texlive-module-cyrillic.doc-2016.tar.xz mirror://gentoo/texlive-module-cyrillic-bin.doc-2016.tar.xz mirror://gentoo/texlive-module-disser.doc-2016.tar.xz mirror://gentoo/texlive-module-eskd.doc-2016.tar.xz mirror://gentoo/texlive-module-eskdx.doc-2016.tar.xz mirror://gentoo/texlive-module-gost.doc-2016.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian.doc-2016.tar.xz mirror://gentoo/texlive-module-lcyw.doc-2016.tar.xz mirror://gentoo/texlive-module-lh.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-mongol.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-russian.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-ukr.doc-2016.tar.xz mirror://gentoo/texlive-module-mongolian-babel.doc-2016.tar.xz mirror://gentoo/texlive-module-montex.doc-2016.tar.xz mirror://gentoo/texlive-module-mpman-ru.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg.doc-2016.tar.xz mirror://gentoo/texlive-module-russ.doc-2016.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe.doc-2016.tar.xz mirror://gentoo/texlive-module-serbian-date-lat.doc-2016.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr.doc-2016.tar.xz mirror://gentoo/texlive-module-serbian-lig.doc-2016.tar.xz mirror://gentoo/texlive-module-t2.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-ru.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-sr.doc-2016.tar.xz mirror://gentoo/texlive-module-ukrhyph.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-belarusian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-russian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-serbian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-serbianc.source-2016.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.source-2016.tar.xz mirror://gentoo/texlive-module-cyrillic.source-2016.tar.xz mirror://gentoo/texlive-module-disser.source-2016.tar.xz mirror://gentoo/texlive-module-eskd.source-2016.tar.xz mirror://gentoo/texlive-module-gost.source-2016.tar.xz mirror://gentoo/texlive-module-lcyw.source-2016.tar.xz mirror://gentoo/texlive-module-lh.source-2016.tar.xz mirror://gentoo/texlive-module-lhcyr.source-2016.tar.xz mirror://gentoo/texlive-module-mongolian-babel.source-2016.tar.xz mirror://gentoo/texlive-module-ruhyphen.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=097d7b52f6d3ff62b2aa5d4c791f7de6
+_md5_=02d91286e28017d5c07255f1a0c39931
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2016 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2016
index a8bc060d297b..3ef2501a47a9 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Czech/Slovak
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-latex-2016 !dev-texlive/texlive-documentation-czechslovak >=app-text/texlive-core-2014[xetex] !<dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-luatex-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-czech-2016.tar.xz mirror://gentoo/texlive-module-babel-slovak-2016.tar.xz mirror://gentoo/texlive-module-cnbwp-2016.tar.xz mirror://gentoo/texlive-module-cs-2016.tar.xz mirror://gentoo/texlive-module-csbulletin-2016.tar.xz mirror://gentoo/texlive-module-cslatex-2016.tar.xz mirror://gentoo/texlive-module-csplain-2016.tar.xz mirror://gentoo/texlive-module-cstex-2016.tar.xz mirror://gentoo/texlive-module-hyphen-czech-2016.tar.xz mirror://gentoo/texlive-module-hyphen-slovak-2016.tar.xz mirror://gentoo/texlive-module-lshort-czech-2016.tar.xz mirror://gentoo/texlive-module-lshort-slovak-2016.tar.xz mirror://gentoo/texlive-module-texlive-cz-2016.tar.xz mirror://gentoo/texlive-module-collection-langczechslovak-2016.tar.xz doc? ( mirror://gentoo/texlive-module-babel-czech.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-slovak.doc-2016.tar.xz mirror://gentoo/texlive-module-cnbwp.doc-2016.tar.xz mirror://gentoo/texlive-module-csbulletin.doc-2016.tar.xz mirror://gentoo/texlive-module-cstex.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-czech.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-slovak.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-cz.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-czech.source-2016.tar.xz mirror://gentoo/texlive-module-babel-slovak.source-2016.tar.xz mirror://gentoo/texlive-module-cslatex.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=a7299be1f3a11b52a6ff1a4378e7385b
+_md5_=b60591364de15730487cab632d8c1ff4
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2016 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2016
index 2ab8e3c3caea..cf65c2ec1713 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langenglish-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive US and UK English
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-documentation-english !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-hyphen-english-2016.tar.xz mirror://gentoo/texlive-module-FAQ-en-2016.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles-2016.tar.xz mirror://gentoo/texlive-module-Type1fonts-2016.tar.xz mirror://gentoo/texlive-module-amslatex-primer-2016.tar.xz mirror://gentoo/texlive-module-around-the-bend-2016.tar.xz mirror://gentoo/texlive-module-ascii-chart-2016.tar.xz mirror://gentoo/texlive-module-components-of-TeX-2016.tar.xz mirror://gentoo/texlive-module-comprehensive-2016.tar.xz mirror://gentoo/texlive-module-dickimaw-2016.tar.xz mirror://gentoo/texlive-module-dtxtut-2016.tar.xz mirror://gentoo/texlive-module-first-latex-doc-2016.tar.xz mirror://gentoo/texlive-module-forest-quickstart-2016.tar.xz mirror://gentoo/texlive-module-gentle-2016.tar.xz mirror://gentoo/texlive-module-guide-to-latex-2016.tar.xz mirror://gentoo/texlive-module-happy4th-2016.tar.xz mirror://gentoo/texlive-module-impatient-2016.tar.xz mirror://gentoo/texlive-module-intro-scientific-2016.tar.xz mirror://gentoo/texlive-module-knuth-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-english-2016.tar.xz mirror://gentoo/texlive-module-latex-brochure-2016.tar.xz mirror://gentoo/texlive-module-latex-course-2016.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr-2016.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion-2016.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide-2016.tar.xz mirror://gentoo/texlive-module-latex-web-companion-2016.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-2016.tar.xz mirror://gentoo/texlive-module-latex4wp-2016.tar.xz mirror://gentoo/texlive-module-latexcheat-2016.tar.xz mirror://gentoo/texlive-module-latexcourse-rug-2016.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs-2016.tar.xz mirror://gentoo/texlive-module-lshort-english-2016.tar.xz mirror://gentoo/texlive-module-macros2e-2016.tar.xz mirror://gentoo/texlive-module-math-e-2016.tar.xz mirror://gentoo/texlive-module-math-into-latex-4-2016.tar.xz mirror://gentoo/texlive-module-maths-symbols-2016.tar.xz mirror://gentoo/texlive-module-memdesign-2016.tar.xz mirror://gentoo/texlive-module-metafont-beginners-2016.tar.xz mirror://gentoo/texlive-module-metapost-examples-2016.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial-2016.tar.xz mirror://gentoo/texlive-module-pictexsum-2016.tar.xz mirror://gentoo/texlive-module-plain-doc-2016.tar.xz mirror://gentoo/texlive-module-presentations-en-2016.tar.xz mirror://gentoo/texlive-module-simplified-latex-2016.tar.xz mirror://gentoo/texlive-module-svg-inkscape-2016.tar.xz mirror://gentoo/texlive-module-tabulars-e-2016.tar.xz mirror://gentoo/texlive-module-tamethebeast-2016.tar.xz mirror://gentoo/texlive-module-tds-2016.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet-2016.tar.xz mirror://gentoo/texlive-module-tex-overview-2016.tar.xz mirror://gentoo/texlive-module-tex-refs-2016.tar.xz mirror://gentoo/texlive-module-texbytopic-2016.tar.xz mirror://gentoo/texlive-module-titlepages-2016.tar.xz mirror://gentoo/texlive-module-tlc2-2016.tar.xz mirror://gentoo/texlive-module-undergradmath-2016.tar.xz mirror://gentoo/texlive-module-visualfaq-2016.tar.xz mirror://gentoo/texlive-module-webguide-2016.tar.xz mirror://gentoo/texlive-module-xetexref-2016.tar.xz mirror://gentoo/texlive-module-collection-langenglish-2016.tar.xz doc? ( mirror://gentoo/texlive-module-FAQ-en.doc-2016.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles.doc-2016.tar.xz mirror://gentoo/texlive-module-Type1fonts.doc-2016.tar.xz mirror://gentoo/texlive-module-amslatex-primer.doc-2016.tar.xz mirror://gentoo/texlive-module-around-the-bend.doc-2016.tar.xz mirror://gentoo/texlive-module-ascii-chart.doc-2016.tar.xz mirror://gentoo/texlive-module-components-of-TeX.doc-2016.tar.xz mirror://gentoo/texlive-module-comprehensive.doc-2016.tar.xz mirror://gentoo/texlive-module-dickimaw.doc-2016.tar.xz mirror://gentoo/texlive-module-dtxtut.doc-2016.tar.xz mirror://gentoo/texlive-module-first-latex-doc.doc-2016.tar.xz mirror://gentoo/texlive-module-forest-quickstart.doc-2016.tar.xz mirror://gentoo/texlive-module-gentle.doc-2016.tar.xz mirror://gentoo/texlive-module-guide-to-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-happy4th.doc-2016.tar.xz mirror://gentoo/texlive-module-impatient.doc-2016.tar.xz mirror://gentoo/texlive-module-intro-scientific.doc-2016.tar.xz mirror://gentoo/texlive-module-knuth.doc-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-english.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-brochure.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-course.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-web-companion.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-latex4wp.doc-2016.tar.xz mirror://gentoo/texlive-module-latexcheat.doc-2016.tar.xz mirror://gentoo/texlive-module-latexcourse-rug.doc-2016.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-english.doc-2016.tar.xz mirror://gentoo/texlive-module-macros2e.doc-2016.tar.xz mirror://gentoo/texlive-module-math-e.doc-2016.tar.xz mirror://gentoo/texlive-module-math-into-latex-4.doc-2016.tar.xz mirror://gentoo/texlive-module-maths-symbols.doc-2016.tar.xz mirror://gentoo/texlive-module-memdesign.doc-2016.tar.xz mirror://gentoo/texlive-module-metafont-beginners.doc-2016.tar.xz mirror://gentoo/texlive-module-metapost-examples.doc-2016.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial.doc-2016.tar.xz mirror://gentoo/texlive-module-pictexsum.doc-2016.tar.xz mirror://gentoo/texlive-module-plain-doc.doc-2016.tar.xz mirror://gentoo/texlive-module-presentations-en.doc-2016.tar.xz mirror://gentoo/texlive-module-simplified-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-svg-inkscape.doc-2016.tar.xz mirror://gentoo/texlive-module-tabulars-e.doc-2016.tar.xz mirror://gentoo/texlive-module-tamethebeast.doc-2016.tar.xz mirror://gentoo/texlive-module-tds.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-overview.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-refs.doc-2016.tar.xz mirror://gentoo/texlive-module-texbytopic.doc-2016.tar.xz mirror://gentoo/texlive-module-titlepages.doc-2016.tar.xz mirror://gentoo/texlive-module-tlc2.doc-2016.tar.xz mirror://gentoo/texlive-module-undergradmath.doc-2016.tar.xz mirror://gentoo/texlive-module-visualfaq.doc-2016.tar.xz mirror://gentoo/texlive-module-webguide.doc-2016.tar.xz mirror://gentoo/texlive-module-xetexref.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-knuth.source-2016.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=dc8eb8c23215475e37e395a752a11d91
+_md5_=3a343815d06c5312135daeaef78f739b
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2016 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2016
index a70d6c611111..4436a0880ff0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Other European languages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian !dev-texlive/texlive-langlatvian !dev-texlive/texlive-langlatin !dev-texlive/texlive-langnorwegian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-armtex-2016.tar.xz mirror://gentoo/texlive-module-babel-albanian-2016.tar.xz mirror://gentoo/texlive-module-babel-bosnian-2016.tar.xz mirror://gentoo/texlive-module-babel-breton-2016.tar.xz mirror://gentoo/texlive-module-babel-croatian-2016.tar.xz mirror://gentoo/texlive-module-babel-danish-2016.tar.xz mirror://gentoo/texlive-module-babel-dutch-2016.tar.xz mirror://gentoo/texlive-module-babel-estonian-2016.tar.xz mirror://gentoo/texlive-module-babel-finnish-2016.tar.xz mirror://gentoo/texlive-module-babel-friulan-2016.tar.xz mirror://gentoo/texlive-module-babel-hungarian-2016.tar.xz mirror://gentoo/texlive-module-babel-icelandic-2016.tar.xz mirror://gentoo/texlive-module-babel-irish-2016.tar.xz mirror://gentoo/texlive-module-babel-kurmanji-2016.tar.xz mirror://gentoo/texlive-module-babel-latin-2016.tar.xz mirror://gentoo/texlive-module-babel-latvian-2016.tar.xz mirror://gentoo/texlive-module-babel-macedonian-2016.tar.xz mirror://gentoo/texlive-module-babel-norsk-2016.tar.xz mirror://gentoo/texlive-module-babel-occitan-2016.tar.xz mirror://gentoo/texlive-module-babel-piedmontese-2016.tar.xz mirror://gentoo/texlive-module-babel-romanian-2016.tar.xz mirror://gentoo/texlive-module-babel-romansh-2016.tar.xz mirror://gentoo/texlive-module-babel-samin-2016.tar.xz mirror://gentoo/texlive-module-babel-scottish-2016.tar.xz mirror://gentoo/texlive-module-babel-slovenian-2016.tar.xz mirror://gentoo/texlive-module-babel-swedish-2016.tar.xz mirror://gentoo/texlive-module-babel-turkish-2016.tar.xz mirror://gentoo/texlive-module-babel-welsh-2016.tar.xz mirror://gentoo/texlive-module-finbib-2016.tar.xz mirror://gentoo/texlive-module-gloss-occitan-2016.tar.xz mirror://gentoo/texlive-module-hrlatex-2016.tar.xz mirror://gentoo/texlive-module-hyphen-armenian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-croatian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-danish-2016.tar.xz mirror://gentoo/texlive-module-hyphen-dutch-2016.tar.xz mirror://gentoo/texlive-module-hyphen-estonian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-finnish-2016.tar.xz mirror://gentoo/texlive-module-hyphen-friulan-2016.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-icelandic-2016.tar.xz mirror://gentoo/texlive-module-hyphen-irish-2016.tar.xz mirror://gentoo/texlive-module-hyphen-kurmanji-2016.tar.xz mirror://gentoo/texlive-module-hyphen-latin-2016.tar.xz mirror://gentoo/texlive-module-hyphen-latvian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-lithuanian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-norwegian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-occitan-2016.tar.xz mirror://gentoo/texlive-module-hyphen-piedmontese-2016.tar.xz mirror://gentoo/texlive-module-hyphen-romanian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-romansh-2016.tar.xz mirror://gentoo/texlive-module-hyphen-slovenian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-swedish-2016.tar.xz mirror://gentoo/texlive-module-hyphen-turkish-2016.tar.xz mirror://gentoo/texlive-module-hyphen-uppersorbian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-welsh-2016.tar.xz mirror://gentoo/texlive-module-lithuanian-2016.tar.xz mirror://gentoo/texlive-module-lshort-dutch-2016.tar.xz mirror://gentoo/texlive-module-lshort-estonian-2016.tar.xz mirror://gentoo/texlive-module-lshort-finnish-2016.tar.xz mirror://gentoo/texlive-module-lshort-slovenian-2016.tar.xz mirror://gentoo/texlive-module-lshort-turkish-2016.tar.xz mirror://gentoo/texlive-module-nevelok-2016.tar.xz mirror://gentoo/texlive-module-swebib-2016.tar.xz mirror://gentoo/texlive-module-turkmen-2016.tar.xz mirror://gentoo/texlive-module-collection-langeuropean-2016.tar.xz doc? ( mirror://gentoo/texlive-module-armtex.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-albanian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-bosnian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-breton.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-croatian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-danish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-dutch.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-estonian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-finnish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-friulan.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-hungarian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-icelandic.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-irish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-latin.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-latvian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-macedonian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-norsk.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-occitan.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-romanian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-romansh.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-samin.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-scottish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-slovenian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-swedish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-turkish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-welsh.doc-2016.tar.xz mirror://gentoo/texlive-module-gloss-occitan.doc-2016.tar.xz mirror://gentoo/texlive-module-hrlatex.doc-2016.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian.doc-2016.tar.xz mirror://gentoo/texlive-module-lithuanian.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-dutch.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-estonian.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-finnish.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-slovenian.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-turkish.doc-2016.tar.xz mirror://gentoo/texlive-module-nevelok.doc-2016.tar.xz mirror://gentoo/texlive-module-swebib.doc-2016.tar.xz mirror://gentoo/texlive-module-turkmen.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-albanian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-bosnian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-breton.source-2016.tar.xz mirror://gentoo/texlive-module-babel-croatian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-danish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-dutch.source-2016.tar.xz mirror://gentoo/texlive-module-babel-estonian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-finnish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-friulan.source-2016.tar.xz mirror://gentoo/texlive-module-babel-icelandic.source-2016.tar.xz mirror://gentoo/texlive-module-babel-irish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.source-2016.tar.xz mirror://gentoo/texlive-module-babel-latin.source-2016.tar.xz mirror://gentoo/texlive-module-babel-latvian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-macedonian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-norsk.source-2016.tar.xz mirror://gentoo/texlive-module-babel-occitan.source-2016.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.source-2016.tar.xz mirror://gentoo/texlive-module-babel-romanian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-romansh.source-2016.tar.xz mirror://gentoo/texlive-module-babel-samin.source-2016.tar.xz mirror://gentoo/texlive-module-babel-scottish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-slovenian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-swedish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-turkish.source-2016.tar.xz mirror://gentoo/texlive-module-babel-welsh.source-2016.tar.xz mirror://gentoo/texlive-module-gloss-occitan.source-2016.tar.xz mirror://gentoo/texlive-module-hrlatex.source-2016.tar.xz mirror://gentoo/texlive-module-hyphen-armenian.source-2016.tar.xz mirror://gentoo/texlive-module-hyphen-turkish.source-2016.tar.xz mirror://gentoo/texlive-module-nevelok.source-2016.tar.xz mirror://gentoo/texlive-module-turkmen.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=9f8f950302adca4734b1f939459c11ed
+_md5_=26cf9d45578e70280b799fb2e26dd95e
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2016 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2016
index 9b1cb7cfe8b7..81e3e8763c60 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langfrench-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive French
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-documentation-french !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aeguill-2016.tar.xz mirror://gentoo/texlive-module-apprends-latex-2016.tar.xz mirror://gentoo/texlive-module-babel-basque-2016.tar.xz mirror://gentoo/texlive-module-babel-french-2016.tar.xz mirror://gentoo/texlive-module-basque-book-2016.tar.xz mirror://gentoo/texlive-module-basque-date-2016.tar.xz mirror://gentoo/texlive-module-bib-fr-2016.tar.xz mirror://gentoo/texlive-module-bibleref-french-2016.tar.xz mirror://gentoo/texlive-module-booktabs-fr-2016.tar.xz mirror://gentoo/texlive-module-droit-fr-2016.tar.xz mirror://gentoo/texlive-module-e-french-2016.tar.xz mirror://gentoo/texlive-module-epslatex-fr-2016.tar.xz mirror://gentoo/texlive-module-facture-2016.tar.xz mirror://gentoo/texlive-module-formation-latex-ul-2016.tar.xz mirror://gentoo/texlive-module-frletter-2016.tar.xz mirror://gentoo/texlive-module-hyphen-basque-2016.tar.xz mirror://gentoo/texlive-module-hyphen-french-2016.tar.xz mirror://gentoo/texlive-module-impatient-fr-2016.tar.xz mirror://gentoo/texlive-module-impnattypo-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-french-2016.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr-2016.tar.xz mirror://gentoo/texlive-module-lshort-french-2016.tar.xz mirror://gentoo/texlive-module-mafr-2016.tar.xz mirror://gentoo/texlive-module-tabvar-2016.tar.xz mirror://gentoo/texlive-module-tdsfrmath-2016.tar.xz mirror://gentoo/texlive-module-texlive-fr-2016.tar.xz mirror://gentoo/texlive-module-translation-array-fr-2016.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr-2016.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr-2016.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr-2016.tar.xz mirror://gentoo/texlive-module-variations-2016.tar.xz mirror://gentoo/texlive-module-visualtikz-2016.tar.xz mirror://gentoo/texlive-module-collection-langfrench-2016.tar.xz doc? ( mirror://gentoo/texlive-module-aeguill.doc-2016.tar.xz mirror://gentoo/texlive-module-apprends-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-basque.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-french.doc-2016.tar.xz mirror://gentoo/texlive-module-basque-book.doc-2016.tar.xz mirror://gentoo/texlive-module-basque-date.doc-2016.tar.xz mirror://gentoo/texlive-module-bib-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-bibleref-french.doc-2016.tar.xz mirror://gentoo/texlive-module-booktabs-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-droit-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-e-french.doc-2016.tar.xz mirror://gentoo/texlive-module-epslatex-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-facture.doc-2016.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.doc-2016.tar.xz mirror://gentoo/texlive-module-frletter.doc-2016.tar.xz mirror://gentoo/texlive-module-impatient-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-impnattypo.doc-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-french.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-french.doc-2016.tar.xz mirror://gentoo/texlive-module-mafr.doc-2016.tar.xz mirror://gentoo/texlive-module-tabvar.doc-2016.tar.xz mirror://gentoo/texlive-module-tdsfrmath.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-array-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr.doc-2016.tar.xz mirror://gentoo/texlive-module-variations.doc-2016.tar.xz mirror://gentoo/texlive-module-visualtikz.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-basque.source-2016.tar.xz mirror://gentoo/texlive-module-babel-french.source-2016.tar.xz mirror://gentoo/texlive-module-basque-book.source-2016.tar.xz mirror://gentoo/texlive-module-basque-date.source-2016.tar.xz mirror://gentoo/texlive-module-bibleref-french.source-2016.tar.xz mirror://gentoo/texlive-module-facture.source-2016.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.source-2016.tar.xz mirror://gentoo/texlive-module-hyphen-basque.source-2016.tar.xz mirror://gentoo/texlive-module-impnattypo.source-2016.tar.xz mirror://gentoo/texlive-module-tabvar.source-2016.tar.xz mirror://gentoo/texlive-module-tdsfrmath.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=74d48a52fa5d998b7cad8aa90c4c04a5
+_md5_=f64364518a2b3210d860a4033d4d4ddc
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2016 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2016
index 2d097db64843..b8e79252451d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langgerman-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive German
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 OPL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-latexextra-2009 !dev-texlive/texlive-documentation-german !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-apalike-german-2016.tar.xz mirror://gentoo/texlive-module-babel-german-2016.tar.xz mirror://gentoo/texlive-module-bibleref-german-2016.tar.xz mirror://gentoo/texlive-module-booktabs-de-2016.tar.xz mirror://gentoo/texlive-module-csquotes-de-2016.tar.xz mirror://gentoo/texlive-module-dehyph-exptl-2016.tar.xz mirror://gentoo/texlive-module-dhua-2016.tar.xz mirror://gentoo/texlive-module-einfuehrung-2016.tar.xz mirror://gentoo/texlive-module-einfuehrung2-2016.tar.xz mirror://gentoo/texlive-module-etdipa-2016.tar.xz mirror://gentoo/texlive-module-etoolbox-de-2016.tar.xz mirror://gentoo/texlive-module-fifinddo-info-2016.tar.xz mirror://gentoo/texlive-module-geometry-de-2016.tar.xz mirror://gentoo/texlive-module-german-2016.tar.xz mirror://gentoo/texlive-module-germbib-2016.tar.xz mirror://gentoo/texlive-module-germkorr-2016.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura-2016.tar.xz mirror://gentoo/texlive-module-hyphen-german-2016.tar.xz mirror://gentoo/texlive-module-koma-script-examples-2016.tar.xz mirror://gentoo/texlive-module-l2picfaq-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-2016.tar.xz mirror://gentoo/texlive-module-latex-bib-ex-2016.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex-2016.tar.xz mirror://gentoo/texlive-module-latex-referenz-2016.tar.xz mirror://gentoo/texlive-module-latex-tabellen-2016.tar.xz mirror://gentoo/texlive-module-latexcheat-de-2016.tar.xz mirror://gentoo/texlive-module-lshort-german-2016.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de-2016.tar.xz mirror://gentoo/texlive-module-microtype-de-2016.tar.xz mirror://gentoo/texlive-module-milog-2016.tar.xz mirror://gentoo/texlive-module-presentations-2016.tar.xz mirror://gentoo/texlive-module-r_und_s-2016.tar.xz mirror://gentoo/texlive-module-templates-fenn-2016.tar.xz mirror://gentoo/texlive-module-templates-sommer-2016.tar.xz mirror://gentoo/texlive-module-texlive-de-2016.tar.xz mirror://gentoo/texlive-module-tipa-de-2016.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de-2016.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de-2016.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de-2016.tar.xz mirror://gentoo/texlive-module-translation-ecv-de-2016.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de-2016.tar.xz mirror://gentoo/texlive-module-translation-europecv-de-2016.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de-2016.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de-2016.tar.xz mirror://gentoo/texlive-module-udesoftec-2016.tar.xz mirror://gentoo/texlive-module-uhrzeit-2016.tar.xz mirror://gentoo/texlive-module-umlaute-2016.tar.xz mirror://gentoo/texlive-module-voss-mathcol-2016.tar.xz mirror://gentoo/texlive-module-collection-langgerman-2016.tar.xz doc? ( mirror://gentoo/texlive-module-apalike-german.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-german.doc-2016.tar.xz mirror://gentoo/texlive-module-bibleref-german.doc-2016.tar.xz mirror://gentoo/texlive-module-booktabs-de.doc-2016.tar.xz mirror://gentoo/texlive-module-csquotes-de.doc-2016.tar.xz mirror://gentoo/texlive-module-dehyph-exptl.doc-2016.tar.xz mirror://gentoo/texlive-module-dhua.doc-2016.tar.xz mirror://gentoo/texlive-module-einfuehrung.doc-2016.tar.xz mirror://gentoo/texlive-module-einfuehrung2.doc-2016.tar.xz mirror://gentoo/texlive-module-etdipa.doc-2016.tar.xz mirror://gentoo/texlive-module-etoolbox-de.doc-2016.tar.xz mirror://gentoo/texlive-module-fifinddo-info.doc-2016.tar.xz mirror://gentoo/texlive-module-geometry-de.doc-2016.tar.xz mirror://gentoo/texlive-module-german.doc-2016.tar.xz mirror://gentoo/texlive-module-germbib.doc-2016.tar.xz mirror://gentoo/texlive-module-germkorr.doc-2016.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.doc-2016.tar.xz mirror://gentoo/texlive-module-koma-script-examples.doc-2016.tar.xz mirror://gentoo/texlive-module-l2picfaq.doc-2016.tar.xz mirror://gentoo/texlive-module-l2tabu.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-bib-ex.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-referenz.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-tabellen.doc-2016.tar.xz mirror://gentoo/texlive-module-latexcheat-de.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-german.doc-2016.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de.doc-2016.tar.xz mirror://gentoo/texlive-module-microtype-de.doc-2016.tar.xz mirror://gentoo/texlive-module-milog.doc-2016.tar.xz mirror://gentoo/texlive-module-presentations.doc-2016.tar.xz mirror://gentoo/texlive-module-r_und_s.doc-2016.tar.xz mirror://gentoo/texlive-module-templates-fenn.doc-2016.tar.xz mirror://gentoo/texlive-module-templates-sommer.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-de.doc-2016.tar.xz mirror://gentoo/texlive-module-tipa-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-ecv-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-europecv-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de.doc-2016.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de.doc-2016.tar.xz mirror://gentoo/texlive-module-udesoftec.doc-2016.tar.xz mirror://gentoo/texlive-module-uhrzeit.doc-2016.tar.xz mirror://gentoo/texlive-module-umlaute.doc-2016.tar.xz mirror://gentoo/texlive-module-voss-mathcol.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-german.source-2016.tar.xz mirror://gentoo/texlive-module-dhua.source-2016.tar.xz mirror://gentoo/texlive-module-fifinddo-info.source-2016.tar.xz mirror://gentoo/texlive-module-german.source-2016.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.source-2016.tar.xz mirror://gentoo/texlive-module-udesoftec.source-2016.tar.xz mirror://gentoo/texlive-module-umlaute.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=75ba36398beea6a6f097329a3e5916e3
+_md5_=c8bcdd6cf315403087d4103ba2d05225
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2016 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2016
index 0fc2a7d3df4f..034f9d6201ad 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langgreek-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Greek
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-greek-2016.tar.xz mirror://gentoo/texlive-module-begingreek-2016.tar.xz mirror://gentoo/texlive-module-betababel-2016.tar.xz mirror://gentoo/texlive-module-bgreek-2016.tar.xz mirror://gentoo/texlive-module-cbfonts-2016.tar.xz mirror://gentoo/texlive-module-cbfonts-fd-2016.tar.xz mirror://gentoo/texlive-module-gfsbaskerville-2016.tar.xz mirror://gentoo/texlive-module-gfsporson-2016.tar.xz mirror://gentoo/texlive-module-greek-fontenc-2016.tar.xz mirror://gentoo/texlive-module-greek-inputenc-2016.tar.xz mirror://gentoo/texlive-module-greekdates-2016.tar.xz mirror://gentoo/texlive-module-greektex-2016.tar.xz mirror://gentoo/texlive-module-greektonoi-2016.tar.xz mirror://gentoo/texlive-module-hyphen-greek-2016.tar.xz mirror://gentoo/texlive-module-hyphen-ancientgreek-2016.tar.xz mirror://gentoo/texlive-module-ibycus-babel-2016.tar.xz mirror://gentoo/texlive-module-ibygrk-2016.tar.xz mirror://gentoo/texlive-module-kerkis-2016.tar.xz mirror://gentoo/texlive-module-levy-2016.tar.xz mirror://gentoo/texlive-module-lgreek-2016.tar.xz mirror://gentoo/texlive-module-mkgrkindex-2016.tar.xz mirror://gentoo/texlive-module-teubner-2016.tar.xz mirror://gentoo/texlive-module-xgreek-2016.tar.xz mirror://gentoo/texlive-module-yannisgr-2016.tar.xz mirror://gentoo/texlive-module-collection-langgreek-2016.tar.xz doc? ( mirror://gentoo/texlive-module-babel-greek.doc-2016.tar.xz mirror://gentoo/texlive-module-begingreek.doc-2016.tar.xz mirror://gentoo/texlive-module-betababel.doc-2016.tar.xz mirror://gentoo/texlive-module-bgreek.doc-2016.tar.xz mirror://gentoo/texlive-module-cbfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.doc-2016.tar.xz mirror://gentoo/texlive-module-gfsbaskerville.doc-2016.tar.xz mirror://gentoo/texlive-module-gfsporson.doc-2016.tar.xz mirror://gentoo/texlive-module-greek-fontenc.doc-2016.tar.xz mirror://gentoo/texlive-module-greek-inputenc.doc-2016.tar.xz mirror://gentoo/texlive-module-greekdates.doc-2016.tar.xz mirror://gentoo/texlive-module-greektex.doc-2016.tar.xz mirror://gentoo/texlive-module-greektonoi.doc-2016.tar.xz mirror://gentoo/texlive-module-hyphen-greek.doc-2016.tar.xz mirror://gentoo/texlive-module-ibycus-babel.doc-2016.tar.xz mirror://gentoo/texlive-module-ibygrk.doc-2016.tar.xz mirror://gentoo/texlive-module-kerkis.doc-2016.tar.xz mirror://gentoo/texlive-module-levy.doc-2016.tar.xz mirror://gentoo/texlive-module-lgreek.doc-2016.tar.xz mirror://gentoo/texlive-module-mkgrkindex.doc-2016.tar.xz mirror://gentoo/texlive-module-teubner.doc-2016.tar.xz mirror://gentoo/texlive-module-xgreek.doc-2016.tar.xz mirror://gentoo/texlive-module-yannisgr.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-greek.source-2016.tar.xz mirror://gentoo/texlive-module-begingreek.source-2016.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.source-2016.tar.xz mirror://gentoo/texlive-module-greekdates.source-2016.tar.xz mirror://gentoo/texlive-module-ibycus-babel.source-2016.tar.xz mirror://gentoo/texlive-module-teubner.source-2016.tar.xz mirror://gentoo/texlive-module-xgreek.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=8edd6067e7cf76900f0437004400e0ed
+_md5_=b4645771ce004ebcaa705cee398bb729
diff --git a/metadata/md5-cache/dev-texlive/texlive-langindic-2016 b/metadata/md5-cache/dev-texlive/texlive-langindic-2016
index 2946a9124622..525d821f34b2 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langindic-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langindic-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Indic scripts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-bangtex-2016.tar.xz mirror://gentoo/texlive-module-latexbangla-2016.tar.xz mirror://gentoo/texlive-module-bengali-2016.tar.xz mirror://gentoo/texlive-module-burmese-2016.tar.xz mirror://gentoo/texlive-module-ebong-2016.tar.xz mirror://gentoo/texlive-module-hyphen-indic-2016.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit-2016.tar.xz mirror://gentoo/texlive-module-sanskrit-2016.tar.xz mirror://gentoo/texlive-module-sanskrit-t1-2016.tar.xz mirror://gentoo/texlive-module-velthuis-2016.tar.xz mirror://gentoo/texlive-module-wnri-2016.tar.xz mirror://gentoo/texlive-module-wnri-latex-2016.tar.xz mirror://gentoo/texlive-module-xetex-devanagari-2016.tar.xz mirror://gentoo/texlive-module-collection-langindic-2016.tar.xz doc? ( mirror://gentoo/texlive-module-bangtex.doc-2016.tar.xz mirror://gentoo/texlive-module-latexbangla.doc-2016.tar.xz mirror://gentoo/texlive-module-bengali.doc-2016.tar.xz mirror://gentoo/texlive-module-burmese.doc-2016.tar.xz mirror://gentoo/texlive-module-ebong.doc-2016.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit.doc-2016.tar.xz mirror://gentoo/texlive-module-sanskrit.doc-2016.tar.xz mirror://gentoo/texlive-module-sanskrit-t1.doc-2016.tar.xz mirror://gentoo/texlive-module-velthuis.doc-2016.tar.xz mirror://gentoo/texlive-module-wnri.doc-2016.tar.xz mirror://gentoo/texlive-module-wnri-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-xetex-devanagari.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-bengali.source-2016.tar.xz mirror://gentoo/texlive-module-burmese.source-2016.tar.xz mirror://gentoo/texlive-module-sanskrit.source-2016.tar.xz mirror://gentoo/texlive-module-wnri-latex.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=b5f4d4149a7f2effec7d947987417852
+_md5_=f6fe97cf5b2c9039f1dd0c76401ec9fb
diff --git a/metadata/md5-cache/dev-texlive/texlive-langitalian-2016 b/metadata/md5-cache/dev-texlive/texlive-langitalian-2016
index 8e1dbe3779cf..0fc1f5b73468 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langitalian-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langitalian-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Italian
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-documentation-italian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-it-2016.tar.xz mirror://gentoo/texlive-module-amsmath-it-2016.tar.xz mirror://gentoo/texlive-module-amsthdoc-it-2016.tar.xz mirror://gentoo/texlive-module-babel-italian-2016.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano-2016.tar.xz mirror://gentoo/texlive-module-fancyhdr-it-2016.tar.xz mirror://gentoo/texlive-module-fixltxhyph-2016.tar.xz mirror://gentoo/texlive-module-frontespizio-2016.tar.xz mirror://gentoo/texlive-module-hyphen-italian-2016.tar.xz mirror://gentoo/texlive-module-itnumpar-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-italian-2016.tar.xz mirror://gentoo/texlive-module-latex4wp-it-2016.tar.xz mirror://gentoo/texlive-module-layaureo-2016.tar.xz mirror://gentoo/texlive-module-lshort-italian-2016.tar.xz mirror://gentoo/texlive-module-psfrag-italian-2016.tar.xz mirror://gentoo/texlive-module-texlive-it-2016.tar.xz mirror://gentoo/texlive-module-collection-langitalian-2016.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-it.doc-2016.tar.xz mirror://gentoo/texlive-module-amsmath-it.doc-2016.tar.xz mirror://gentoo/texlive-module-amsthdoc-it.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-italian.doc-2016.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.doc-2016.tar.xz mirror://gentoo/texlive-module-fancyhdr-it.doc-2016.tar.xz mirror://gentoo/texlive-module-fixltxhyph.doc-2016.tar.xz mirror://gentoo/texlive-module-frontespizio.doc-2016.tar.xz mirror://gentoo/texlive-module-itnumpar.doc-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-italian.doc-2016.tar.xz mirror://gentoo/texlive-module-latex4wp-it.doc-2016.tar.xz mirror://gentoo/texlive-module-layaureo.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-italian.doc-2016.tar.xz mirror://gentoo/texlive-module-psfrag-italian.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-it.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-italian.source-2016.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.source-2016.tar.xz mirror://gentoo/texlive-module-fixltxhyph.source-2016.tar.xz mirror://gentoo/texlive-module-frontespizio.source-2016.tar.xz mirror://gentoo/texlive-module-itnumpar.source-2016.tar.xz mirror://gentoo/texlive-module-layaureo.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=73045f6344e097645301ec1abff701f2
+_md5_=4a06d70465b4c294c5f9b5407fb82b64
diff --git a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2016 b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2016
index d21a52985925..dda9f371013f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Japanese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2016 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 dev-lang/ruby >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-japanese-2016.tar.xz mirror://gentoo/texlive-module-bxbase-2016.tar.xz mirror://gentoo/texlive-module-bxcjkjatype-2016.tar.xz mirror://gentoo/texlive-module-bxjalipsum-2016.tar.xz mirror://gentoo/texlive-module-bxjscls-2016.tar.xz mirror://gentoo/texlive-module-convbkmk-2016.tar.xz mirror://gentoo/texlive-module-ipaex-2016.tar.xz mirror://gentoo/texlive-module-japanese-otf-2016.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex-2016.tar.xz mirror://gentoo/texlive-module-jsclasses-2016.tar.xz mirror://gentoo/texlive-module-lshort-japanese-2016.tar.xz mirror://gentoo/texlive-module-luatexja-2016.tar.xz mirror://gentoo/texlive-module-mendex-doc-2016.tar.xz mirror://gentoo/texlive-module-pbibtex-base-2016.tar.xz mirror://gentoo/texlive-module-platex-2016.tar.xz mirror://gentoo/texlive-module-platex-tools-2016.tar.xz mirror://gentoo/texlive-module-platexcheat-2016.tar.xz mirror://gentoo/texlive-module-ptex-2016.tar.xz mirror://gentoo/texlive-module-ptex-base-2016.tar.xz mirror://gentoo/texlive-module-ptex-fonts-2016.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps-2016.tar.xz mirror://gentoo/texlive-module-ptex2pdf-2016.tar.xz mirror://gentoo/texlive-module-pxbase-2016.tar.xz mirror://gentoo/texlive-module-pxchfon-2016.tar.xz mirror://gentoo/texlive-module-pxcjkcat-2016.tar.xz mirror://gentoo/texlive-module-pxjahyper-2016.tar.xz mirror://gentoo/texlive-module-pxrubrica-2016.tar.xz mirror://gentoo/texlive-module-uplatex-2016.tar.xz mirror://gentoo/texlive-module-uptex-2016.tar.xz mirror://gentoo/texlive-module-uptex-base-2016.tar.xz mirror://gentoo/texlive-module-uptex-fonts-2016.tar.xz mirror://gentoo/texlive-module-wadalab-2016.tar.xz mirror://gentoo/texlive-module-zxjafbfont-2016.tar.xz mirror://gentoo/texlive-module-zxjatype-2016.tar.xz mirror://gentoo/texlive-module-collection-langjapanese-2016.tar.xz doc? ( mirror://gentoo/texlive-module-babel-japanese.doc-2016.tar.xz mirror://gentoo/texlive-module-bxbase.doc-2016.tar.xz mirror://gentoo/texlive-module-bxcjkjatype.doc-2016.tar.xz mirror://gentoo/texlive-module-bxjalipsum.doc-2016.tar.xz mirror://gentoo/texlive-module-bxjscls.doc-2016.tar.xz mirror://gentoo/texlive-module-convbkmk.doc-2016.tar.xz mirror://gentoo/texlive-module-ipaex.doc-2016.tar.xz mirror://gentoo/texlive-module-japanese-otf.doc-2016.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex.doc-2016.tar.xz mirror://gentoo/texlive-module-jsclasses.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-japanese.doc-2016.tar.xz mirror://gentoo/texlive-module-luatexja.doc-2016.tar.xz mirror://gentoo/texlive-module-mendex-doc.doc-2016.tar.xz mirror://gentoo/texlive-module-pbibtex-base.doc-2016.tar.xz mirror://gentoo/texlive-module-platex.doc-2016.tar.xz mirror://gentoo/texlive-module-platex-tools.doc-2016.tar.xz mirror://gentoo/texlive-module-platexcheat.doc-2016.tar.xz mirror://gentoo/texlive-module-ptex.doc-2016.tar.xz mirror://gentoo/texlive-module-ptex-base.doc-2016.tar.xz mirror://gentoo/texlive-module-ptex-fonts.doc-2016.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps.doc-2016.tar.xz mirror://gentoo/texlive-module-ptex2pdf.doc-2016.tar.xz mirror://gentoo/texlive-module-pxbase.doc-2016.tar.xz mirror://gentoo/texlive-module-pxchfon.doc-2016.tar.xz mirror://gentoo/texlive-module-pxcjkcat.doc-2016.tar.xz mirror://gentoo/texlive-module-pxjahyper.doc-2016.tar.xz mirror://gentoo/texlive-module-pxrubrica.doc-2016.tar.xz mirror://gentoo/texlive-module-uplatex.doc-2016.tar.xz mirror://gentoo/texlive-module-uptex.doc-2016.tar.xz mirror://gentoo/texlive-module-uptex-base.doc-2016.tar.xz mirror://gentoo/texlive-module-uptex-fonts.doc-2016.tar.xz mirror://gentoo/texlive-module-wadalab.doc-2016.tar.xz mirror://gentoo/texlive-module-zxjafbfont.doc-2016.tar.xz mirror://gentoo/texlive-module-zxjatype.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-japanese.source-2016.tar.xz mirror://gentoo/texlive-module-bxjscls.source-2016.tar.xz mirror://gentoo/texlive-module-japanese-otf.source-2016.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex.source-2016.tar.xz mirror://gentoo/texlive-module-jsclasses.source-2016.tar.xz mirror://gentoo/texlive-module-luatexja.source-2016.tar.xz mirror://gentoo/texlive-module-platex.source-2016.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps.source-2016.tar.xz mirror://gentoo/texlive-module-pxrubrica.source-2016.tar.xz mirror://gentoo/texlive-module-uplatex.source-2016.tar.xz mirror://gentoo/texlive-module-uptex-fonts.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=780ccd27d9bb27aa6d0e0ec25acafe6f
+_md5_=450f3d1fa3f10821b81e4b7611e0c9a9
diff --git a/metadata/md5-cache/dev-texlive/texlive-langkorean-2016 b/metadata/md5-cache/dev-texlive/texlive-langkorean-2016
index c7ee276884df..adf2b0cc6d42 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langkorean-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langkorean-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Korean
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2016 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-baekmuk-2016.tar.xz mirror://gentoo/texlive-module-cjk-ko-2016.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir-2016.tar.xz mirror://gentoo/texlive-module-kotex-plain-2016.tar.xz mirror://gentoo/texlive-module-kotex-utf-2016.tar.xz mirror://gentoo/texlive-module-kotex-utils-2016.tar.xz mirror://gentoo/texlive-module-lshort-korean-2016.tar.xz mirror://gentoo/texlive-module-nanumtype1-2016.tar.xz mirror://gentoo/texlive-module-uhc-2016.tar.xz mirror://gentoo/texlive-module-unfonts-core-2016.tar.xz mirror://gentoo/texlive-module-unfonts-extra-2016.tar.xz mirror://gentoo/texlive-module-collection-langkorean-2016.tar.xz doc? ( mirror://gentoo/texlive-module-baekmuk.doc-2016.tar.xz mirror://gentoo/texlive-module-cjk-ko.doc-2016.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir.doc-2016.tar.xz mirror://gentoo/texlive-module-kotex-plain.doc-2016.tar.xz mirror://gentoo/texlive-module-kotex-utf.doc-2016.tar.xz mirror://gentoo/texlive-module-kotex-utils.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-korean.doc-2016.tar.xz mirror://gentoo/texlive-module-nanumtype1.doc-2016.tar.xz mirror://gentoo/texlive-module-uhc.doc-2016.tar.xz mirror://gentoo/texlive-module-unfonts-core.doc-2016.tar.xz mirror://gentoo/texlive-module-unfonts-extra.doc-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=cf6220dacf7a7d0d1a6501c7456f5a57
+_md5_=0116200ec7cd3c0b62b9a63f3110ec46
diff --git a/metadata/md5-cache/dev-texlive/texlive-langother-2016 b/metadata/md5-cache/dev-texlive/texlive-langother-2016
index fdb9a2cbc7c0..7af930006080 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langother-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langother-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Other languages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-basic-2009 !dev-texlive/texlive-documentation-vietnamese !dev-texlive/texlive-langvietnamese !<dev-texlive/texlive-langcjk-2013 !dev-texlive/texlive-langhebrew !dev-texlive/texlive-documentation-thai !dev-texlive/texlive-langturkmen !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-vn-2016.tar.xz mirror://gentoo/texlive-module-aramaic-serto-2016.tar.xz mirror://gentoo/texlive-module-babel-bahasa-2016.tar.xz mirror://gentoo/texlive-module-babel-esperanto-2016.tar.xz mirror://gentoo/texlive-module-babel-georgian-2016.tar.xz mirror://gentoo/texlive-module-babel-hebrew-2016.tar.xz mirror://gentoo/texlive-module-babel-interlingua-2016.tar.xz mirror://gentoo/texlive-module-babel-sorbian-2016.tar.xz mirror://gentoo/texlive-module-babel-thai-2016.tar.xz mirror://gentoo/texlive-module-babel-vietnamese-2016.tar.xz mirror://gentoo/texlive-module-cjhebrew-2016.tar.xz mirror://gentoo/texlive-module-ctib-2016.tar.xz mirror://gentoo/texlive-module-fonts-tlwg-2016.tar.xz mirror://gentoo/texlive-module-hyphen-afrikaans-2016.tar.xz mirror://gentoo/texlive-module-hyphen-coptic-2016.tar.xz mirror://gentoo/texlive-module-hyphen-esperanto-2016.tar.xz mirror://gentoo/texlive-module-hyphen-georgian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-indonesian-2016.tar.xz mirror://gentoo/texlive-module-hyphen-interlingua-2016.tar.xz mirror://gentoo/texlive-module-hyphen-thai-2016.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen-2016.tar.xz mirror://gentoo/texlive-module-lshort-thai-2016.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese-2016.tar.xz mirror://gentoo/texlive-module-ntheorem-vn-2016.tar.xz mirror://gentoo/texlive-module-padauk-2016.tar.xz mirror://gentoo/texlive-module-vntex-2016.tar.xz mirror://gentoo/texlive-module-collection-langother-2016.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-vn.doc-2016.tar.xz mirror://gentoo/texlive-module-aramaic-serto.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-bahasa.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-esperanto.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-georgian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-hebrew.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-interlingua.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-sorbian.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-thai.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.doc-2016.tar.xz mirror://gentoo/texlive-module-cjhebrew.doc-2016.tar.xz mirror://gentoo/texlive-module-ctib.doc-2016.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-thai.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese.doc-2016.tar.xz mirror://gentoo/texlive-module-ntheorem-vn.doc-2016.tar.xz mirror://gentoo/texlive-module-padauk.doc-2016.tar.xz mirror://gentoo/texlive-module-vntex.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-bahasa.source-2016.tar.xz mirror://gentoo/texlive-module-babel-esperanto.source-2016.tar.xz mirror://gentoo/texlive-module-babel-hebrew.source-2016.tar.xz mirror://gentoo/texlive-module-babel-interlingua.source-2016.tar.xz mirror://gentoo/texlive-module-babel-sorbian.source-2016.tar.xz mirror://gentoo/texlive-module-babel-thai.source-2016.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.source-2016.tar.xz mirror://gentoo/texlive-module-ctib.source-2016.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.source-2016.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen.source-2016.tar.xz mirror://gentoo/texlive-module-vntex.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=8b2baf8c9e0b67569fab4b5e1b1467ef
+_md5_=d8793dd95e5075bb5478fc99191a2a70
diff --git a/metadata/md5-cache/dev-texlive/texlive-langpolish-2016 b/metadata/md5-cache/dev-texlive/texlive-langpolish-2016
index 9a7ff0054ef1..7c9270d3fef7 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langpolish-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langpolish-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Polish
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2016 >=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-documentation-polish !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-polish-2016.tar.xz mirror://gentoo/texlive-module-cc-pl-2016.tar.xz mirror://gentoo/texlive-module-gustlib-2016.tar.xz mirror://gentoo/texlive-module-gustprog-2016.tar.xz mirror://gentoo/texlive-module-hyphen-polish-2016.tar.xz mirror://gentoo/texlive-module-lshort-polish-2016.tar.xz mirror://gentoo/texlive-module-mex-2016.tar.xz mirror://gentoo/texlive-module-mwcls-2016.tar.xz mirror://gentoo/texlive-module-pl-2016.tar.xz mirror://gentoo/texlive-module-polski-2016.tar.xz mirror://gentoo/texlive-module-przechlewski-book-2016.tar.xz mirror://gentoo/texlive-module-qpxqtx-2016.tar.xz mirror://gentoo/texlive-module-tap-2016.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl-2016.tar.xz mirror://gentoo/texlive-module-texlive-pl-2016.tar.xz mirror://gentoo/texlive-module-utf8mex-2016.tar.xz mirror://gentoo/texlive-module-collection-langpolish-2016.tar.xz doc? ( mirror://gentoo/texlive-module-babel-polish.doc-2016.tar.xz mirror://gentoo/texlive-module-cc-pl.doc-2016.tar.xz mirror://gentoo/texlive-module-gustlib.doc-2016.tar.xz mirror://gentoo/texlive-module-gustprog.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-polish.doc-2016.tar.xz mirror://gentoo/texlive-module-mex.doc-2016.tar.xz mirror://gentoo/texlive-module-mwcls.doc-2016.tar.xz mirror://gentoo/texlive-module-pl.doc-2016.tar.xz mirror://gentoo/texlive-module-polski.doc-2016.tar.xz mirror://gentoo/texlive-module-przechlewski-book.doc-2016.tar.xz mirror://gentoo/texlive-module-qpxqtx.doc-2016.tar.xz mirror://gentoo/texlive-module-tap.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-pl.doc-2016.tar.xz mirror://gentoo/texlive-module-utf8mex.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-polish.source-2016.tar.xz mirror://gentoo/texlive-module-mex.source-2016.tar.xz mirror://gentoo/texlive-module-mwcls.source-2016.tar.xz mirror://gentoo/texlive-module-polski.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=83fa0376223f57204e5d737f10c24908
+_md5_=8c74b4d48a9b3ecd16a000a3828c95ee
diff --git a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2016 b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2016
index 41bdd122d9e8..8b31014905c0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Portuguese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-documentation-portuguese !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-portuges-2016.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt-2016.tar.xz mirror://gentoo/texlive-module-cursolatex-2016.tar.xz mirror://gentoo/texlive-module-feupphdteses-2016.tar.xz mirror://gentoo/texlive-module-hyphen-portuguese-2016.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr-2016.tar.xz mirror://gentoo/texlive-module-lshort-portuguese-2016.tar.xz mirror://gentoo/texlive-module-ordinalpt-2016.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt-2016.tar.xz mirror://gentoo/texlive-module-collection-langportuguese-2016.tar.xz doc? ( mirror://gentoo/texlive-module-babel-portuges.doc-2016.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt.doc-2016.tar.xz mirror://gentoo/texlive-module-cursolatex.doc-2016.tar.xz mirror://gentoo/texlive-module-feupphdteses.doc-2016.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-portuguese.doc-2016.tar.xz mirror://gentoo/texlive-module-ordinalpt.doc-2016.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-portuges.source-2016.tar.xz mirror://gentoo/texlive-module-ordinalpt.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=e6590d15140d439e2633900504c03ded
+_md5_=4ba3f97139d5d5399e575872638775c0
diff --git a/metadata/md5-cache/dev-texlive/texlive-langspanish-2016 b/metadata/md5-cache/dev-texlive/texlive-langspanish-2016
index 93148ad0e882..4abbccbc0c29 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langspanish-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-langspanish-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Spanish
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !dev-texlive/texlive-documentation-spanish !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-catalan-2016.tar.xz mirror://gentoo/texlive-module-babel-galician-2016.tar.xz mirror://gentoo/texlive-module-babel-spanglish-2016.tar.xz mirror://gentoo/texlive-module-babel-spanish-2016.tar.xz mirror://gentoo/texlive-module-es-tex-faq-2016.tar.xz mirror://gentoo/texlive-module-hyphen-catalan-2016.tar.xz mirror://gentoo/texlive-module-hyphen-galician-2016.tar.xz mirror://gentoo/texlive-module-hyphen-spanish-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish-2016.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish-2016.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx-2016.tar.xz mirror://gentoo/texlive-module-lshort-spanish-2016.tar.xz mirror://gentoo/texlive-module-spanish-mx-2016.tar.xz mirror://gentoo/texlive-module-texlive-es-2016.tar.xz mirror://gentoo/texlive-module-collection-langspanish-2016.tar.xz doc? ( mirror://gentoo/texlive-module-babel-catalan.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-galician.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-spanglish.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-spanish.doc-2016.tar.xz mirror://gentoo/texlive-module-es-tex-faq.doc-2016.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.doc-2016.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish.doc-2016.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx.doc-2016.tar.xz mirror://gentoo/texlive-module-lshort-spanish.doc-2016.tar.xz mirror://gentoo/texlive-module-spanish-mx.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive-es.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-catalan.source-2016.tar.xz mirror://gentoo/texlive-module-babel-galician.source-2016.tar.xz mirror://gentoo/texlive-module-babel-spanish.source-2016.tar.xz mirror://gentoo/texlive-module-hyphen-galician.source-2016.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=3a2a29c69c6777145824e7b83f5e02bd
+_md5_=05ed5cbcf668adc9e60151ceec8d2812
diff --git a/metadata/md5-cache/dev-texlive/texlive-latex-2016 b/metadata/md5-cache/dev-texlive/texlive-latex-2016
index 9c2d711e54b9..073611ce18e2 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latex-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-latex-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX fundamental packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2016 !!<dev-texlive/texlive-latex-2016 !<dev-texlive/texlive-context-2010 !<dev-texlive/texlive-latexrecommended-2014 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-ae-2016.tar.xz mirror://gentoo/texlive-module-amscls-2016.tar.xz mirror://gentoo/texlive-module-amsmath-2016.tar.xz mirror://gentoo/texlive-module-babel-2016.tar.xz mirror://gentoo/texlive-module-babel-english-2016.tar.xz mirror://gentoo/texlive-module-babelbib-2016.tar.xz mirror://gentoo/texlive-module-carlisle-2016.tar.xz mirror://gentoo/texlive-module-colortbl-2016.tar.xz mirror://gentoo/texlive-module-fancyhdr-2016.tar.xz mirror://gentoo/texlive-module-fix2col-2016.tar.xz mirror://gentoo/texlive-module-geometry-2016.tar.xz mirror://gentoo/texlive-module-graphics-2016.tar.xz mirror://gentoo/texlive-module-graphics-cfg-2016.tar.xz mirror://gentoo/texlive-module-hyperref-2016.tar.xz mirror://gentoo/texlive-module-latex-2016.tar.xz mirror://gentoo/texlive-module-latex-bin-2016.tar.xz mirror://gentoo/texlive-module-latex-fonts-2016.tar.xz mirror://gentoo/texlive-module-latexconfig-2016.tar.xz mirror://gentoo/texlive-module-ltxmisc-2016.tar.xz mirror://gentoo/texlive-module-mfnfss-2016.tar.xz mirror://gentoo/texlive-module-mptopdf-2016.tar.xz mirror://gentoo/texlive-module-natbib-2016.tar.xz mirror://gentoo/texlive-module-oberdiek-2016.tar.xz mirror://gentoo/texlive-module-pslatex-2016.tar.xz mirror://gentoo/texlive-module-psnfss-2016.tar.xz mirror://gentoo/texlive-module-pspicture-2016.tar.xz mirror://gentoo/texlive-module-tools-2016.tar.xz mirror://gentoo/texlive-module-url-2016.tar.xz mirror://gentoo/texlive-module-collection-latex-2016.tar.xz doc? ( mirror://gentoo/texlive-module-ae.doc-2016.tar.xz mirror://gentoo/texlive-module-amscls.doc-2016.tar.xz mirror://gentoo/texlive-module-amsmath.doc-2016.tar.xz mirror://gentoo/texlive-module-babel.doc-2016.tar.xz mirror://gentoo/texlive-module-babel-english.doc-2016.tar.xz mirror://gentoo/texlive-module-babelbib.doc-2016.tar.xz mirror://gentoo/texlive-module-carlisle.doc-2016.tar.xz mirror://gentoo/texlive-module-colortbl.doc-2016.tar.xz mirror://gentoo/texlive-module-fancyhdr.doc-2016.tar.xz mirror://gentoo/texlive-module-fix2col.doc-2016.tar.xz mirror://gentoo/texlive-module-geometry.doc-2016.tar.xz mirror://gentoo/texlive-module-graphics.doc-2016.tar.xz mirror://gentoo/texlive-module-graphics-cfg.doc-2016.tar.xz mirror://gentoo/texlive-module-hyperref.doc-2016.tar.xz mirror://gentoo/texlive-module-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-bin.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-fonts.doc-2016.tar.xz mirror://gentoo/texlive-module-mfnfss.doc-2016.tar.xz mirror://gentoo/texlive-module-mptopdf.doc-2016.tar.xz mirror://gentoo/texlive-module-natbib.doc-2016.tar.xz mirror://gentoo/texlive-module-oberdiek.doc-2016.tar.xz mirror://gentoo/texlive-module-psnfss.doc-2016.tar.xz mirror://gentoo/texlive-module-pspicture.doc-2016.tar.xz mirror://gentoo/texlive-module-tools.doc-2016.tar.xz mirror://gentoo/texlive-module-url.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-ae.source-2016.tar.xz mirror://gentoo/texlive-module-amscls.source-2016.tar.xz mirror://gentoo/texlive-module-amsmath.source-2016.tar.xz mirror://gentoo/texlive-module-babel.source-2016.tar.xz mirror://gentoo/texlive-module-babel-english.source-2016.tar.xz mirror://gentoo/texlive-module-carlisle.source-2016.tar.xz mirror://gentoo/texlive-module-colortbl.source-2016.tar.xz mirror://gentoo/texlive-module-fix2col.source-2016.tar.xz mirror://gentoo/texlive-module-geometry.source-2016.tar.xz mirror://gentoo/texlive-module-graphics.source-2016.tar.xz mirror://gentoo/texlive-module-hyperref.source-2016.tar.xz mirror://gentoo/texlive-module-latex.source-2016.tar.xz mirror://gentoo/texlive-module-mfnfss.source-2016.tar.xz mirror://gentoo/texlive-module-natbib.source-2016.tar.xz mirror://gentoo/texlive-module-oberdiek.source-2016.tar.xz mirror://gentoo/texlive-module-pslatex.source-2016.tar.xz mirror://gentoo/texlive-module-psnfss.source-2016.tar.xz mirror://gentoo/texlive-module-pspicture.source-2016.tar.xz mirror://gentoo/texlive-module-tools.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=33585f31a6a6fe1949af118347635baa
+_md5_=3eb8a3cbc87f9c45c76ad95273eaa834
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexextra-2016 b/metadata/md5-cache/dev-texlive/texlive-latexextra-2016
index e036e2269563..4c08ca51b22f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexextra-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-latexextra-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX additional packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latexrecommended-2016 >=dev-texlive/texlive-pictures-2016 >=dev-texlive/texlive-fontsrecommended-2014 !dev-tex/achemso !dev-tex/prosper !dev-tex/ha-prosper !dev-tex/texpower !dev-tex/cdcover !dev-tex/ppower4 !=dev-texlive/texlive-latexrecommended-2007* !=dev-texlive/texlive-latex3-2007* !<dev-texlive/texlive-humanities-2014 !<dev-texlive/texlive-mathextra-2010 !<dev-texlive/texlive-plainextra-2010 !<dev-texlive/texlive-pictures-2013 dev-perl/Spreadsheet-ParseExcel >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-2up-2016.tar.xz mirror://gentoo/texlive-module-ESIEEcv-2016.tar.xz mirror://gentoo/texlive-module-GS1-2016.tar.xz mirror://gentoo/texlive-module-HA-prosper-2016.tar.xz mirror://gentoo/texlive-module-Tabbing-2016.tar.xz mirror://gentoo/texlive-module-a0poster-2016.tar.xz mirror://gentoo/texlive-module-a4wide-2016.tar.xz mirror://gentoo/texlive-module-a5comb-2016.tar.xz mirror://gentoo/texlive-module-abraces-2016.tar.xz mirror://gentoo/texlive-module-abstract-2016.tar.xz mirror://gentoo/texlive-module-achemso-2016.tar.xz mirror://gentoo/texlive-module-acro-2016.tar.xz mirror://gentoo/texlive-module-acronym-2016.tar.xz mirror://gentoo/texlive-module-acroterm-2016.tar.xz mirror://gentoo/texlive-module-actuarialangle-2016.tar.xz mirror://gentoo/texlive-module-addfont-2016.tar.xz mirror://gentoo/texlive-module-addlines-2016.tar.xz mirror://gentoo/texlive-module-adjmulticol-2016.tar.xz mirror://gentoo/texlive-module-adjustbox-2016.tar.xz mirror://gentoo/texlive-module-adrconv-2016.tar.xz mirror://gentoo/texlive-module-advdate-2016.tar.xz mirror://gentoo/texlive-module-akktex-2016.tar.xz mirror://gentoo/texlive-module-akletter-2016.tar.xz mirror://gentoo/texlive-module-alertmessage-2016.tar.xz mirror://gentoo/texlive-module-alnumsec-2016.tar.xz mirror://gentoo/texlive-module-alterqcm-2016.tar.xz mirror://gentoo/texlive-module-altfont-2016.tar.xz mirror://gentoo/texlive-module-amsaddr-2016.tar.xz mirror://gentoo/texlive-module-animate-2016.tar.xz mirror://gentoo/texlive-module-anonchap-2016.tar.xz mirror://gentoo/texlive-module-answers-2016.tar.xz mirror://gentoo/texlive-module-anyfontsize-2016.tar.xz mirror://gentoo/texlive-module-appendix-2016.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer-2016.tar.xz mirror://gentoo/texlive-module-apptools-2016.tar.xz mirror://gentoo/texlive-module-arcs-2016.tar.xz mirror://gentoo/texlive-module-arrayjobx-2016.tar.xz mirror://gentoo/texlive-module-arraysort-2016.tar.xz mirror://gentoo/texlive-module-arydshln-2016.tar.xz mirror://gentoo/texlive-module-asciilist-2016.tar.xz mirror://gentoo/texlive-module-assignment-2016.tar.xz mirror://gentoo/texlive-module-assoccnt-2016.tar.xz mirror://gentoo/texlive-module-attachfile-2016.tar.xz mirror://gentoo/texlive-module-aurl-2016.tar.xz mirror://gentoo/texlive-module-authoraftertitle-2016.tar.xz mirror://gentoo/texlive-module-authorindex-2016.tar.xz mirror://gentoo/texlive-module-autonum-2016.tar.xz mirror://gentoo/texlive-module-autopdf-2016.tar.xz mirror://gentoo/texlive-module-avremu-2016.tar.xz mirror://gentoo/texlive-module-background-2016.tar.xz mirror://gentoo/texlive-module-bankstatement-2016.tar.xz mirror://gentoo/texlive-module-bashful-2016.tar.xz mirror://gentoo/texlive-module-basicarith-2016.tar.xz mirror://gentoo/texlive-module-bchart-2016.tar.xz mirror://gentoo/texlive-module-beamer2thesis-2016.tar.xz mirror://gentoo/texlive-module-beameraudience-2016.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl-2016.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes-2016.tar.xz mirror://gentoo/texlive-module-beamerposter-2016.tar.xz mirror://gentoo/texlive-module-beamersubframe-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc-2016.tar.xz mirror://gentoo/texlive-module-beamerthemejltree-2016.tar.xz mirror://gentoo/texlive-module-beamerthemenirma-2016.tar.xz mirror://gentoo/texlive-module-beton-2016.tar.xz mirror://gentoo/texlive-module-bewerbung-2016.tar.xz mirror://gentoo/texlive-module-bez123-2016.tar.xz mirror://gentoo/texlive-module-bezos-2016.tar.xz mirror://gentoo/texlive-module-bhcexam-2016.tar.xz mirror://gentoo/texlive-module-bibletext-2016.tar.xz mirror://gentoo/texlive-module-bigfoot-2016.tar.xz mirror://gentoo/texlive-module-bigints-2016.tar.xz mirror://gentoo/texlive-module-bizcard-2016.tar.xz mirror://gentoo/texlive-module-blindtext-2016.tar.xz mirror://gentoo/texlive-module-blkarray-2016.tar.xz mirror://gentoo/texlive-module-block-2016.tar.xz mirror://gentoo/texlive-module-bnumexpr-2016.tar.xz mirror://gentoo/texlive-module-boites-2016.tar.xz mirror://gentoo/texlive-module-bold-extra-2016.tar.xz mirror://gentoo/texlive-module-bookcover-2016.tar.xz mirror://gentoo/texlive-module-bookest-2016.tar.xz mirror://gentoo/texlive-module-booklet-2016.tar.xz mirror://gentoo/texlive-module-boolexpr-2016.tar.xz mirror://gentoo/texlive-module-bophook-2016.tar.xz mirror://gentoo/texlive-module-boxedminipage-2016.tar.xz mirror://gentoo/texlive-module-boxedminipage2e-2016.tar.xz mirror://gentoo/texlive-module-boxhandler-2016.tar.xz mirror://gentoo/texlive-module-bracketkey-2016.tar.xz mirror://gentoo/texlive-module-braket-2016.tar.xz mirror://gentoo/texlive-module-breakurl-2016.tar.xz mirror://gentoo/texlive-module-bullcntr-2016.tar.xz mirror://gentoo/texlive-module-bussproofs-2016.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer-2016.tar.xz mirror://gentoo/texlive-module-bxdvidriver-2016.tar.xz mirror://gentoo/texlive-module-bxenclose-2016.tar.xz mirror://gentoo/texlive-module-bxnewfont-2016.tar.xz mirror://gentoo/texlive-module-bxpapersize-2016.tar.xz mirror://gentoo/texlive-module-bxpdfver-2016.tar.xz mirror://gentoo/texlive-module-calcage-2016.tar.xz mirror://gentoo/texlive-module-calctab-2016.tar.xz mirror://gentoo/texlive-module-calculator-2016.tar.xz mirror://gentoo/texlive-module-calrsfs-2016.tar.xz mirror://gentoo/texlive-module-cals-2016.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy-2016.tar.xz mirror://gentoo/texlive-module-cancel-2016.tar.xz mirror://gentoo/texlive-module-canoniclayout-2016.tar.xz mirror://gentoo/texlive-module-capt-of-2016.tar.xz mirror://gentoo/texlive-module-captcont-2016.tar.xz mirror://gentoo/texlive-module-captdef-2016.tar.xz mirror://gentoo/texlive-module-carbohydrates-2016.tar.xz mirror://gentoo/texlive-module-cases-2016.tar.xz mirror://gentoo/texlive-module-casyl-2016.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags-2016.tar.xz mirror://gentoo/texlive-module-catechis-2016.tar.xz mirror://gentoo/texlive-module-catoptions-2016.tar.xz mirror://gentoo/texlive-module-cbcoptic-2016.tar.xz mirror://gentoo/texlive-module-ccaption-2016.tar.xz mirror://gentoo/texlive-module-cclicenses-2016.tar.xz mirror://gentoo/texlive-module-cd-2016.tar.xz mirror://gentoo/texlive-module-cd-cover-2016.tar.xz mirror://gentoo/texlive-module-cdpbundl-2016.tar.xz mirror://gentoo/texlive-module-cellspace-2016.tar.xz mirror://gentoo/texlive-module-censor-2016.tar.xz mirror://gentoo/texlive-module-changebar-2016.tar.xz mirror://gentoo/texlive-module-changelayout-2016.tar.xz mirror://gentoo/texlive-module-changepage-2016.tar.xz mirror://gentoo/texlive-module-changes-2016.tar.xz mirror://gentoo/texlive-module-chappg-2016.tar.xz mirror://gentoo/texlive-module-chapterfolder-2016.tar.xz mirror://gentoo/texlive-module-chet-2016.tar.xz mirror://gentoo/texlive-module-chextras-2016.tar.xz mirror://gentoo/texlive-module-chkfloat-2016.tar.xz mirror://gentoo/texlive-module-chletter-2016.tar.xz mirror://gentoo/texlive-module-chngcntr-2016.tar.xz mirror://gentoo/texlive-module-chronology-2016.tar.xz mirror://gentoo/texlive-module-circ-2016.tar.xz mirror://gentoo/texlive-module-classics-2016.tar.xz mirror://gentoo/texlive-module-clefval-2016.tar.xz mirror://gentoo/texlive-module-cleveref-2016.tar.xz mirror://gentoo/texlive-module-clipboard-2016.tar.xz mirror://gentoo/texlive-module-clock-2016.tar.xz mirror://gentoo/texlive-module-cmdstring-2016.tar.xz mirror://gentoo/texlive-module-cmdtrack-2016.tar.xz mirror://gentoo/texlive-module-cmsd-2016.tar.xz mirror://gentoo/texlive-module-cnltx-2016.tar.xz mirror://gentoo/texlive-module-cntformats-2016.tar.xz mirror://gentoo/texlive-module-cntperchap-2016.tar.xz mirror://gentoo/texlive-module-codedoc-2016.tar.xz mirror://gentoo/texlive-module-codepage-2016.tar.xz mirror://gentoo/texlive-module-codesection-2016.tar.xz mirror://gentoo/texlive-module-collcell-2016.tar.xz mirror://gentoo/texlive-module-collectbox-2016.tar.xz mirror://gentoo/texlive-module-colordoc-2016.tar.xz mirror://gentoo/texlive-module-colorinfo-2016.tar.xz mirror://gentoo/texlive-module-coloring-2016.tar.xz mirror://gentoo/texlive-module-colorspace-2016.tar.xz mirror://gentoo/texlive-module-colortab-2016.tar.xz mirror://gentoo/texlive-module-colorwav-2016.tar.xz mirror://gentoo/texlive-module-colorweb-2016.tar.xz mirror://gentoo/texlive-module-colourchange-2016.tar.xz mirror://gentoo/texlive-module-combelow-2016.tar.xz mirror://gentoo/texlive-module-combine-2016.tar.xz mirror://gentoo/texlive-module-comma-2016.tar.xz mirror://gentoo/texlive-module-commado-2016.tar.xz mirror://gentoo/texlive-module-comment-2016.tar.xz mirror://gentoo/texlive-module-concepts-2016.tar.xz mirror://gentoo/texlive-module-concprog-2016.tar.xz mirror://gentoo/texlive-module-constants-2016.tar.xz mirror://gentoo/texlive-module-continue-2016.tar.xz mirror://gentoo/texlive-module-contour-2016.tar.xz mirror://gentoo/texlive-module-contracard-2016.tar.xz mirror://gentoo/texlive-module-conv-xkv-2016.tar.xz mirror://gentoo/texlive-module-cooking-2016.tar.xz mirror://gentoo/texlive-module-cooking-units-2016.tar.xz mirror://gentoo/texlive-module-cool-2016.tar.xz mirror://gentoo/texlive-module-coollist-2016.tar.xz mirror://gentoo/texlive-module-coolstr-2016.tar.xz mirror://gentoo/texlive-module-coolthms-2016.tar.xz mirror://gentoo/texlive-module-cooltooltips-2016.tar.xz mirror://gentoo/texlive-module-coordsys-2016.tar.xz mirror://gentoo/texlive-module-copyedit-2016.tar.xz mirror://gentoo/texlive-module-copyrightbox-2016.tar.xz mirror://gentoo/texlive-module-coseoul-2016.tar.xz mirror://gentoo/texlive-module-counttexruns-2016.tar.xz mirror://gentoo/texlive-module-courseoutline-2016.tar.xz mirror://gentoo/texlive-module-coursepaper-2016.tar.xz mirror://gentoo/texlive-module-coverpage-2016.tar.xz mirror://gentoo/texlive-module-cprotect-2016.tar.xz mirror://gentoo/texlive-module-crbox-2016.tar.xz mirror://gentoo/texlive-module-crossreference-2016.tar.xz mirror://gentoo/texlive-module-csquotes-2016.tar.xz mirror://gentoo/texlive-module-css-colors-2016.tar.xz mirror://gentoo/texlive-module-csvsimple-2016.tar.xz mirror://gentoo/texlive-module-cuisine-2016.tar.xz mirror://gentoo/texlive-module-currfile-2016.tar.xz mirror://gentoo/texlive-module-cutwin-2016.tar.xz mirror://gentoo/texlive-module-cv-2016.tar.xz mirror://gentoo/texlive-module-cv4tw-2016.tar.xz mirror://gentoo/texlive-module-cweb-latex-2016.tar.xz mirror://gentoo/texlive-module-cyber-2016.tar.xz mirror://gentoo/texlive-module-cybercic-2016.tar.xz mirror://gentoo/texlive-module-dashbox-2016.tar.xz mirror://gentoo/texlive-module-dashrule-2016.tar.xz mirror://gentoo/texlive-module-dashundergaps-2016.tar.xz mirror://gentoo/texlive-module-dataref-2016.tar.xz mirror://gentoo/texlive-module-datatool-2016.tar.xz mirror://gentoo/texlive-module-dateiliste-2016.tar.xz mirror://gentoo/texlive-module-datenumber-2016.tar.xz mirror://gentoo/texlive-module-datetime-2016.tar.xz mirror://gentoo/texlive-module-datetime2-2016.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai-2016.tar.xz mirror://gentoo/texlive-module-datetime2-basque-2016.tar.xz mirror://gentoo/texlive-module-datetime2-breton-2016.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian-2016.tar.xz mirror://gentoo/texlive-module-datetime2-catalan-2016.tar.xz mirror://gentoo/texlive-module-datetime2-croatian-2016.tar.xz mirror://gentoo/texlive-module-datetime2-czech-2016.tar.xz mirror://gentoo/texlive-module-datetime2-danish-2016.tar.xz mirror://gentoo/texlive-module-datetime2-dutch-2016.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext-2016.tar.xz mirror://gentoo/texlive-module-datetime2-english-2016.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto-2016.tar.xz mirror://gentoo/texlive-module-datetime2-estonian-2016.tar.xz mirror://gentoo/texlive-module-datetime2-finnish-2016.tar.xz mirror://gentoo/texlive-module-datetime2-french-2016.tar.xz mirror://gentoo/texlive-module-datetime2-galician-2016.tar.xz mirror://gentoo/texlive-module-datetime2-german-2016.tar.xz mirror://gentoo/texlive-module-datetime2-greek-2016.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew-2016.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic-2016.tar.xz mirror://gentoo/texlive-module-datetime2-irish-2016.tar.xz mirror://gentoo/texlive-module-datetime2-italian-2016.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext-2016.tar.xz mirror://gentoo/texlive-module-datetime2-latin-2016.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian-2016.tar.xz mirror://gentoo/texlive-module-datetime2-magyar-2016.tar.xz mirror://gentoo/texlive-module-datetime2-norsk-2016.tar.xz mirror://gentoo/texlive-module-datetime2-polish-2016.tar.xz mirror://gentoo/texlive-module-datetime2-portuges-2016.tar.xz mirror://gentoo/texlive-module-datetime2-romanian-2016.tar.xz mirror://gentoo/texlive-module-datetime2-russian-2016.tar.xz mirror://gentoo/texlive-module-datetime2-samin-2016.tar.xz mirror://gentoo/texlive-module-datetime2-scottish-2016.tar.xz mirror://gentoo/texlive-module-datetime2-serbian-2016.tar.xz mirror://gentoo/texlive-module-datetime2-slovak-2016.tar.xz mirror://gentoo/texlive-module-datetime2-slovene-2016.tar.xz mirror://gentoo/texlive-module-datetime2-spanish-2016.tar.xz mirror://gentoo/texlive-module-datetime2-swedish-2016.tar.xz mirror://gentoo/texlive-module-datetime2-turkish-2016.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian-2016.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian-2016.tar.xz mirror://gentoo/texlive-module-datetime2-welsh-2016.tar.xz mirror://gentoo/texlive-module-dblfloatfix-2016.tar.xz mirror://gentoo/texlive-module-decimal-2016.tar.xz mirror://gentoo/texlive-module-decorule-2016.tar.xz mirror://gentoo/texlive-module-delimtxt-2016.tar.xz mirror://gentoo/texlive-module-denisbdoc-2016.tar.xz mirror://gentoo/texlive-module-diagbox-2016.tar.xz mirror://gentoo/texlive-module-diagnose-2016.tar.xz mirror://gentoo/texlive-module-dialogl-2016.tar.xz mirror://gentoo/texlive-module-dichokey-2016.tar.xz mirror://gentoo/texlive-module-dinbrief-2016.tar.xz mirror://gentoo/texlive-module-directory-2016.tar.xz mirror://gentoo/texlive-module-dirtytalk-2016.tar.xz mirror://gentoo/texlive-module-dlfltxb-2016.tar.xz mirror://gentoo/texlive-module-dnaseq-2016.tar.xz mirror://gentoo/texlive-module-doclicense-2016.tar.xz mirror://gentoo/texlive-module-docmfp-2016.tar.xz mirror://gentoo/texlive-module-docmute-2016.tar.xz mirror://gentoo/texlive-module-doctools-2016.tar.xz mirror://gentoo/texlive-module-documentation-2016.tar.xz mirror://gentoo/texlive-module-doi-2016.tar.xz mirror://gentoo/texlive-module-dotarrow-2016.tar.xz mirror://gentoo/texlive-module-dotseqn-2016.tar.xz mirror://gentoo/texlive-module-download-2016.tar.xz mirror://gentoo/texlive-module-dox-2016.tar.xz mirror://gentoo/texlive-module-dpfloat-2016.tar.xz mirror://gentoo/texlive-module-dprogress-2016.tar.xz mirror://gentoo/texlive-module-drac-2016.tar.xz mirror://gentoo/texlive-module-draftcopy-2016.tar.xz mirror://gentoo/texlive-module-draftwatermark-2016.tar.xz mirror://gentoo/texlive-module-dtk-2016.tar.xz mirror://gentoo/texlive-module-dtxdescribe-2016.tar.xz mirror://gentoo/texlive-module-dtxgallery-2016.tar.xz mirror://gentoo/texlive-module-dvdcoll-2016.tar.xz mirror://gentoo/texlive-module-dynamicnumber-2016.tar.xz mirror://gentoo/texlive-module-dynblocks-2016.tar.xz mirror://gentoo/texlive-module-ean13isbn-2016.tar.xz mirror://gentoo/texlive-module-easy-2016.tar.xz mirror://gentoo/texlive-module-easy-todo-2016.tar.xz mirror://gentoo/texlive-module-easyfig-2016.tar.xz mirror://gentoo/texlive-module-easylist-2016.tar.xz mirror://gentoo/texlive-module-easyreview-2016.tar.xz mirror://gentoo/texlive-module-ebezier-2016.tar.xz mirror://gentoo/texlive-module-ecclesiastic-2016.tar.xz mirror://gentoo/texlive-module-ecv-2016.tar.xz mirror://gentoo/texlive-module-ed-2016.tar.xz mirror://gentoo/texlive-module-edmargin-2016.tar.xz mirror://gentoo/texlive-module-eemeir-2016.tar.xz mirror://gentoo/texlive-module-efbox-2016.tar.xz mirror://gentoo/texlive-module-egplot-2016.tar.xz mirror://gentoo/texlive-module-elements-2016.tar.xz mirror://gentoo/texlive-module-ellipsis-2016.tar.xz mirror://gentoo/texlive-module-elmath-2016.tar.xz mirror://gentoo/texlive-module-elocalloc-2016.tar.xz mirror://gentoo/texlive-module-elpres-2016.tar.xz mirror://gentoo/texlive-module-elzcards-2016.tar.xz mirror://gentoo/texlive-module-emarks-2016.tar.xz mirror://gentoo/texlive-module-embedall-2016.tar.xz mirror://gentoo/texlive-module-embrac-2016.tar.xz mirror://gentoo/texlive-module-emptypage-2016.tar.xz mirror://gentoo/texlive-module-emulateapj-2016.tar.xz mirror://gentoo/texlive-module-endfloat-2016.tar.xz mirror://gentoo/texlive-module-endheads-2016.tar.xz mirror://gentoo/texlive-module-endnotes-2016.tar.xz mirror://gentoo/texlive-module-engpron-2016.tar.xz mirror://gentoo/texlive-module-engrec-2016.tar.xz mirror://gentoo/texlive-module-enotez-2016.tar.xz mirror://gentoo/texlive-module-enumitem-2016.tar.xz mirror://gentoo/texlive-module-enumitem-zref-2016.tar.xz mirror://gentoo/texlive-module-envbig-2016.tar.xz mirror://gentoo/texlive-module-environ-2016.tar.xz mirror://gentoo/texlive-module-epigraph-2016.tar.xz mirror://gentoo/texlive-module-epiolmec-2016.tar.xz mirror://gentoo/texlive-module-eqell-2016.tar.xz mirror://gentoo/texlive-module-eqlist-2016.tar.xz mirror://gentoo/texlive-module-eqname-2016.tar.xz mirror://gentoo/texlive-module-eqparbox-2016.tar.xz mirror://gentoo/texlive-module-errata-2016.tar.xz mirror://gentoo/texlive-module-esami-2016.tar.xz mirror://gentoo/texlive-module-esdiff-2016.tar.xz mirror://gentoo/texlive-module-esint-2016.tar.xz mirror://gentoo/texlive-module-esint-type1-2016.tar.xz mirror://gentoo/texlive-module-etaremune-2016.tar.xz mirror://gentoo/texlive-module-etextools-2016.tar.xz mirror://gentoo/texlive-module-etoc-2016.tar.xz mirror://gentoo/texlive-module-etoolbox-2016.tar.xz mirror://gentoo/texlive-module-eukdate-2016.tar.xz mirror://gentoo/texlive-module-eulerpx-2016.tar.xz mirror://gentoo/texlive-module-europasscv-2016.tar.xz mirror://gentoo/texlive-module-everyhook-2016.tar.xz mirror://gentoo/texlive-module-everypage-2016.tar.xz mirror://gentoo/texlive-module-exam-2016.tar.xz mirror://gentoo/texlive-module-exam-n-2016.tar.xz mirror://gentoo/texlive-module-examdesign-2016.tar.xz mirror://gentoo/texlive-module-example-2016.tar.xz mirror://gentoo/texlive-module-examplep-2016.tar.xz mirror://gentoo/texlive-module-exceltex-2016.tar.xz mirror://gentoo/texlive-module-excludeonly-2016.tar.xz mirror://gentoo/texlive-module-exercise-2016.tar.xz mirror://gentoo/texlive-module-exercises-2016.tar.xz mirror://gentoo/texlive-module-exp-testopt-2016.tar.xz mirror://gentoo/texlive-module-expdlist-2016.tar.xz mirror://gentoo/texlive-module-export-2016.tar.xz mirror://gentoo/texlive-module-exsheets-2016.tar.xz mirror://gentoo/texlive-module-exsol-2016.tar.xz mirror://gentoo/texlive-module-extract-2016.tar.xz mirror://gentoo/texlive-module-facsimile-2016.tar.xz mirror://gentoo/texlive-module-factura-2016.tar.xz mirror://gentoo/texlive-module-fancylabel-2016.tar.xz mirror://gentoo/texlive-module-fancynum-2016.tar.xz mirror://gentoo/texlive-module-fancypar-2016.tar.xz mirror://gentoo/texlive-module-fancyslides-2016.tar.xz mirror://gentoo/texlive-module-fancytabs-2016.tar.xz mirror://gentoo/texlive-module-fancytooltips-2016.tar.xz mirror://gentoo/texlive-module-fcolumn-2016.tar.xz mirror://gentoo/texlive-module-ffslides-2016.tar.xz mirror://gentoo/texlive-module-fgruler-2016.tar.xz mirror://gentoo/texlive-module-fibeamer-2016.tar.xz mirror://gentoo/texlive-module-fifo-stack-2016.tar.xz mirror://gentoo/texlive-module-figsize-2016.tar.xz mirror://gentoo/texlive-module-filecontents-2016.tar.xz mirror://gentoo/texlive-module-filecontentsdef-2016.tar.xz mirror://gentoo/texlive-module-filedate-2016.tar.xz mirror://gentoo/texlive-module-filehook-2016.tar.xz mirror://gentoo/texlive-module-fileinfo-2016.tar.xz mirror://gentoo/texlive-module-filemod-2016.tar.xz mirror://gentoo/texlive-module-fink-2016.tar.xz mirror://gentoo/texlive-module-finstrut-2016.tar.xz mirror://gentoo/texlive-module-fithesis-2016.tar.xz mirror://gentoo/texlive-module-fixcmex-2016.tar.xz mirror://gentoo/texlive-module-fixfoot-2016.tar.xz mirror://gentoo/texlive-module-fixme-2016.tar.xz mirror://gentoo/texlive-module-fixmetodonotes-2016.tar.xz mirror://gentoo/texlive-module-fjodor-2016.tar.xz mirror://gentoo/texlive-module-flabels-2016.tar.xz mirror://gentoo/texlive-module-flacards-2016.tar.xz mirror://gentoo/texlive-module-flagderiv-2016.tar.xz mirror://gentoo/texlive-module-flashcards-2016.tar.xz mirror://gentoo/texlive-module-flashmovie-2016.tar.xz mirror://gentoo/texlive-module-flipbook-2016.tar.xz mirror://gentoo/texlive-module-flippdf-2016.tar.xz mirror://gentoo/texlive-module-floatflt-2016.tar.xz mirror://gentoo/texlive-module-floatrow-2016.tar.xz mirror://gentoo/texlive-module-flowfram-2016.tar.xz mirror://gentoo/texlive-module-fmp-2016.tar.xz mirror://gentoo/texlive-module-fmtcount-2016.tar.xz mirror://gentoo/texlive-module-fn2end-2016.tar.xz mirror://gentoo/texlive-module-fnbreak-2016.tar.xz mirror://gentoo/texlive-module-fncychap-2016.tar.xz mirror://gentoo/texlive-module-fncylab-2016.tar.xz mirror://gentoo/texlive-module-fnpara-2016.tar.xz mirror://gentoo/texlive-module-fnpct-2016.tar.xz mirror://gentoo/texlive-module-fnumprint-2016.tar.xz mirror://gentoo/texlive-module-foilhtml-2016.tar.xz mirror://gentoo/texlive-module-fontaxes-2016.tar.xz mirror://gentoo/texlive-module-fonttable-2016.tar.xz mirror://gentoo/texlive-module-footmisc-2016.tar.xz mirror://gentoo/texlive-module-footmisx-2016.tar.xz mirror://gentoo/texlive-module-footnotebackref-2016.tar.xz mirror://gentoo/texlive-module-footnotehyper-2016.tar.xz mirror://gentoo/texlive-module-footnoterange-2016.tar.xz mirror://gentoo/texlive-module-footnpag-2016.tar.xz mirror://gentoo/texlive-module-forarray-2016.tar.xz mirror://gentoo/texlive-module-foreign-2016.tar.xz mirror://gentoo/texlive-module-forloop-2016.tar.xz mirror://gentoo/texlive-module-formlett-2016.tar.xz mirror://gentoo/texlive-module-formular-2016.tar.xz mirror://gentoo/texlive-module-fragments-2016.tar.xz mirror://gentoo/texlive-module-frame-2016.tar.xz mirror://gentoo/texlive-module-framed-2016.tar.xz mirror://gentoo/texlive-module-frankenstein-2016.tar.xz mirror://gentoo/texlive-module-frege-2016.tar.xz mirror://gentoo/texlive-module-ftcap-2016.tar.xz mirror://gentoo/texlive-module-ftnxtra-2016.tar.xz mirror://gentoo/texlive-module-fullblck-2016.tar.xz mirror://gentoo/texlive-module-fullminipage-2016.tar.xz mirror://gentoo/texlive-module-fullwidth-2016.tar.xz mirror://gentoo/texlive-module-fundus-calligra-2016.tar.xz mirror://gentoo/texlive-module-fundus-cyr-2016.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin-2016.tar.xz mirror://gentoo/texlive-module-fvextra-2016.tar.xz mirror://gentoo/texlive-module-fwlw-2016.tar.xz mirror://gentoo/texlive-module-gauss-2016.tar.xz mirror://gentoo/texlive-module-gcard-2016.tar.xz mirror://gentoo/texlive-module-gcite-2016.tar.xz mirror://gentoo/texlive-module-gender-2016.tar.xz mirror://gentoo/texlive-module-genmpage-2016.tar.xz mirror://gentoo/texlive-module-getfiledate-2016.tar.xz mirror://gentoo/texlive-module-getitems-2016.tar.xz mirror://gentoo/texlive-module-ginpenc-2016.tar.xz mirror://gentoo/texlive-module-gitfile-info-2016.tar.xz mirror://gentoo/texlive-module-gitinfo-2016.tar.xz mirror://gentoo/texlive-module-gitinfo2-2016.tar.xz mirror://gentoo/texlive-module-gitlog-2016.tar.xz mirror://gentoo/texlive-module-gloss-2016.tar.xz mirror://gentoo/texlive-module-glossaries-danish-2016.tar.xz mirror://gentoo/texlive-module-glossaries-dutch-2016.tar.xz mirror://gentoo/texlive-module-glossaries-english-2016.tar.xz mirror://gentoo/texlive-module-glossaries-extra-2016.tar.xz mirror://gentoo/texlive-module-glossaries-french-2016.tar.xz mirror://gentoo/texlive-module-glossaries-german-2016.tar.xz mirror://gentoo/texlive-module-glossaries-irish-2016.tar.xz mirror://gentoo/texlive-module-glossaries-italian-2016.tar.xz mirror://gentoo/texlive-module-glossaries-magyar-2016.tar.xz mirror://gentoo/texlive-module-glossaries-polish-2016.tar.xz mirror://gentoo/texlive-module-glossaries-portuges-2016.tar.xz mirror://gentoo/texlive-module-glossaries-serbian-2016.tar.xz mirror://gentoo/texlive-module-glossaries-spanish-2016.tar.xz mirror://gentoo/texlive-module-gmdoc-2016.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance-2016.tar.xz mirror://gentoo/texlive-module-gmiflink-2016.tar.xz mirror://gentoo/texlive-module-gmutils-2016.tar.xz mirror://gentoo/texlive-module-gmverb-2016.tar.xz mirror://gentoo/texlive-module-graphbox-2016.tar.xz mirror://gentoo/texlive-module-graphicx-psmin-2016.tar.xz mirror://gentoo/texlive-module-graphicxbox-2016.tar.xz mirror://gentoo/texlive-module-grfpaste-2016.tar.xz mirror://gentoo/texlive-module-grid-2016.tar.xz mirror://gentoo/texlive-module-grid-system-2016.tar.xz mirror://gentoo/texlive-module-gridset-2016.tar.xz mirror://gentoo/texlive-module-guitlogo-2016.tar.xz mirror://gentoo/texlive-module-halloweenmath-2016.tar.xz mirror://gentoo/texlive-module-handout-2016.tar.xz mirror://gentoo/texlive-module-hang-2016.tar.xz mirror://gentoo/texlive-module-hanging-2016.tar.xz mirror://gentoo/texlive-module-hardwrap-2016.tar.xz mirror://gentoo/texlive-module-harnon-cv-2016.tar.xz mirror://gentoo/texlive-module-harpoon-2016.tar.xz mirror://gentoo/texlive-module-hc-2016.tar.xz mirror://gentoo/texlive-module-he-she-2016.tar.xz mirror://gentoo/texlive-module-hhtensor-2016.tar.xz mirror://gentoo/texlive-module-histogr-2016.tar.xz mirror://gentoo/texlive-module-hitec-2016.tar.xz mirror://gentoo/texlive-module-hletter-2016.tar.xz mirror://gentoo/texlive-module-hpsdiss-2016.tar.xz mirror://gentoo/texlive-module-hrefhide-2016.tar.xz mirror://gentoo/texlive-module-hvindex-2016.tar.xz mirror://gentoo/texlive-module-hypdvips-2016.tar.xz mirror://gentoo/texlive-module-hyper-2016.tar.xz mirror://gentoo/texlive-module-hypernat-2016.tar.xz mirror://gentoo/texlive-module-hyperref-docsrc-2016.tar.xz mirror://gentoo/texlive-module-hyperxmp-2016.tar.xz mirror://gentoo/texlive-module-hyphenat-2016.tar.xz mirror://gentoo/texlive-module-idxcmds-2016.tar.xz mirror://gentoo/texlive-module-idxlayout-2016.tar.xz mirror://gentoo/texlive-module-iffont-2016.tar.xz mirror://gentoo/texlive-module-ifmslide-2016.tar.xz mirror://gentoo/texlive-module-ifmtarg-2016.tar.xz mirror://gentoo/texlive-module-ifnextok-2016.tar.xz mirror://gentoo/texlive-module-ifoddpage-2016.tar.xz mirror://gentoo/texlive-module-ifplatform-2016.tar.xz mirror://gentoo/texlive-module-ifthenx-2016.tar.xz mirror://gentoo/texlive-module-iitem-2016.tar.xz mirror://gentoo/texlive-module-image-gallery-2016.tar.xz mirror://gentoo/texlive-module-imakeidx-2016.tar.xz mirror://gentoo/texlive-module-import-2016.tar.xz mirror://gentoo/texlive-module-incgraph-2016.tar.xz mirror://gentoo/texlive-module-indextools-2016.tar.xz mirror://gentoo/texlive-module-inlinedef-2016.tar.xz mirror://gentoo/texlive-module-inputtrc-2016.tar.xz mirror://gentoo/texlive-module-interactiveworkbook-2016.tar.xz mirror://gentoo/texlive-module-interfaces-2016.tar.xz mirror://gentoo/texlive-module-inversepath-2016.tar.xz mirror://gentoo/texlive-module-invoice-2016.tar.xz mirror://gentoo/texlive-module-iso-2016.tar.xz mirror://gentoo/texlive-module-iso10303-2016.tar.xz mirror://gentoo/texlive-module-isodate-2016.tar.xz mirror://gentoo/texlive-module-isodoc-2016.tar.xz mirror://gentoo/texlive-module-isonums-2016.tar.xz mirror://gentoo/texlive-module-isorot-2016.tar.xz mirror://gentoo/texlive-module-isotope-2016.tar.xz mirror://gentoo/texlive-module-issuulinks-2016.tar.xz mirror://gentoo/texlive-module-iwhdp-2016.tar.xz mirror://gentoo/texlive-module-jlabels-2016.tar.xz mirror://gentoo/texlive-module-jslectureplanner-2016.tar.xz mirror://gentoo/texlive-module-jumplines-2016.tar.xz mirror://gentoo/texlive-module-jvlisting-2016.tar.xz mirror://gentoo/texlive-module-kantlipsum-2016.tar.xz mirror://gentoo/texlive-module-kerntest-2016.tar.xz mirror://gentoo/texlive-module-keycommand-2016.tar.xz mirror://gentoo/texlive-module-keyfloat-2016.tar.xz mirror://gentoo/texlive-module-keyreader-2016.tar.xz mirror://gentoo/texlive-module-keystroke-2016.tar.xz mirror://gentoo/texlive-module-keyval2e-2016.tar.xz mirror://gentoo/texlive-module-keyvaltable-2016.tar.xz mirror://gentoo/texlive-module-kix-2016.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic-2016.tar.xz mirror://gentoo/texlive-module-koma-script-sfs-2016.tar.xz mirror://gentoo/texlive-module-komacv-2016.tar.xz mirror://gentoo/texlive-module-ktv-texdata-2016.tar.xz mirror://gentoo/texlive-module-l3build-2016.tar.xz mirror://gentoo/texlive-module-labbook-2016.tar.xz mirror://gentoo/texlive-module-labels-2016.tar.xz mirror://gentoo/texlive-module-lastpackage-2016.tar.xz mirror://gentoo/texlive-module-lastpage-2016.tar.xz mirror://gentoo/texlive-module-latex-tds-2016.tar.xz mirror://gentoo/texlive-module-latexdemo-2016.tar.xz mirror://gentoo/texlive-module-latexgit-2016.tar.xz mirror://gentoo/texlive-module-layouts-2016.tar.xz mirror://gentoo/texlive-module-lazylist-2016.tar.xz mirror://gentoo/texlive-module-lcd-2016.tar.xz mirror://gentoo/texlive-module-lcg-2016.tar.xz mirror://gentoo/texlive-module-leading-2016.tar.xz mirror://gentoo/texlive-module-leftidx-2016.tar.xz mirror://gentoo/texlive-module-lengthconvert-2016.tar.xz mirror://gentoo/texlive-module-lettre-2016.tar.xz mirror://gentoo/texlive-module-lettrine-2016.tar.xz mirror://gentoo/texlive-module-lewis-2016.tar.xz mirror://gentoo/texlive-module-lhelp-2016.tar.xz mirror://gentoo/texlive-module-libgreek-2016.tar.xz mirror://gentoo/texlive-module-limap-2016.tar.xz mirror://gentoo/texlive-module-linegoal-2016.tar.xz mirror://gentoo/texlive-module-linop-2016.tar.xz mirror://gentoo/texlive-module-lipsum-2016.tar.xz mirror://gentoo/texlive-module-lisp-on-tex-2016.tar.xz mirror://gentoo/texlive-module-listing-2016.tar.xz mirror://gentoo/texlive-module-listlbls-2016.tar.xz mirror://gentoo/texlive-module-listliketab-2016.tar.xz mirror://gentoo/texlive-module-listofsymbols-2016.tar.xz mirror://gentoo/texlive-module-lkproof-2016.tar.xz mirror://gentoo/texlive-module-lmake-2016.tar.xz mirror://gentoo/texlive-module-locality-2016.tar.xz mirror://gentoo/texlive-module-localloc-2016.tar.xz mirror://gentoo/texlive-module-logbox-2016.tar.xz mirror://gentoo/texlive-module-logical-markup-utils-2016.tar.xz mirror://gentoo/texlive-module-logpap-2016.tar.xz mirror://gentoo/texlive-module-longfbox-2016.tar.xz mirror://gentoo/texlive-module-longfigure-2016.tar.xz mirror://gentoo/texlive-module-longnamefilelist-2016.tar.xz mirror://gentoo/texlive-module-loops-2016.tar.xz mirror://gentoo/texlive-module-lsc-2016.tar.xz mirror://gentoo/texlive-module-lstaddons-2016.tar.xz mirror://gentoo/texlive-module-lt3graph-2016.tar.xz mirror://gentoo/texlive-module-ltablex-2016.tar.xz mirror://gentoo/texlive-module-ltabptch-2016.tar.xz mirror://gentoo/texlive-module-ltxdockit-2016.tar.xz mirror://gentoo/texlive-module-ltxindex-2016.tar.xz mirror://gentoo/texlive-module-ltxkeys-2016.tar.xz mirror://gentoo/texlive-module-ltxnew-2016.tar.xz mirror://gentoo/texlive-module-ltxtools-2016.tar.xz mirror://gentoo/texlive-module-macroswap-2016.tar.xz mirror://gentoo/texlive-module-magaz-2016.tar.xz mirror://gentoo/texlive-module-mailing-2016.tar.xz mirror://gentoo/texlive-module-mailmerge-2016.tar.xz mirror://gentoo/texlive-module-makebarcode-2016.tar.xz mirror://gentoo/texlive-module-makebase-2016.tar.xz mirror://gentoo/texlive-module-makebox-2016.tar.xz mirror://gentoo/texlive-module-makecell-2016.tar.xz mirror://gentoo/texlive-module-makecirc-2016.tar.xz mirror://gentoo/texlive-module-makecmds-2016.tar.xz mirror://gentoo/texlive-module-makedtx-2016.tar.xz mirror://gentoo/texlive-module-makeglos-2016.tar.xz mirror://gentoo/texlive-module-mandi-2016.tar.xz mirror://gentoo/texlive-module-manfnt-2016.tar.xz mirror://gentoo/texlive-module-manuscript-2016.tar.xz mirror://gentoo/texlive-module-marginfix-2016.tar.xz mirror://gentoo/texlive-module-marginnote-2016.tar.xz mirror://gentoo/texlive-module-markdown-2016.tar.xz mirror://gentoo/texlive-module-mathalfa-2016.tar.xz mirror://gentoo/texlive-module-mathastext-2016.tar.xz mirror://gentoo/texlive-module-mathexam-2016.tar.xz mirror://gentoo/texlive-module-maybemath-2016.tar.xz mirror://gentoo/texlive-module-mbenotes-2016.tar.xz mirror://gentoo/texlive-module-mcaption-2016.tar.xz mirror://gentoo/texlive-module-mceinleger-2016.tar.xz mirror://gentoo/texlive-module-mcite-2016.tar.xz mirror://gentoo/texlive-module-mciteplus-2016.tar.xz mirror://gentoo/texlive-module-mdframed-2016.tar.xz mirror://gentoo/texlive-module-media9-2016.tar.xz mirror://gentoo/texlive-module-medstarbeamer-2016.tar.xz mirror://gentoo/texlive-module-meetingmins-2016.tar.xz mirror://gentoo/texlive-module-memexsupp-2016.tar.xz mirror://gentoo/texlive-module-memory-2016.tar.xz mirror://gentoo/texlive-module-menu-2016.tar.xz mirror://gentoo/texlive-module-menukeys-2016.tar.xz mirror://gentoo/texlive-module-method-2016.tar.xz mirror://gentoo/texlive-module-metre-2016.tar.xz mirror://gentoo/texlive-module-mfirstuc-2016.tar.xz mirror://gentoo/texlive-module-mftinc-2016.tar.xz mirror://gentoo/texlive-module-midpage-2016.tar.xz mirror://gentoo/texlive-module-minibox-2016.tar.xz mirror://gentoo/texlive-module-minifp-2016.tar.xz mirror://gentoo/texlive-module-minipage-marginpar-2016.tar.xz mirror://gentoo/texlive-module-minitoc-2016.tar.xz mirror://gentoo/texlive-module-minorrevision-2016.tar.xz mirror://gentoo/texlive-module-minted-2016.tar.xz mirror://gentoo/texlive-module-minutes-2016.tar.xz mirror://gentoo/texlive-module-mla-paper-2016.tar.xz mirror://gentoo/texlive-module-mlist-2016.tar.xz mirror://gentoo/texlive-module-mmap-2016.tar.xz mirror://gentoo/texlive-module-mnotes-2016.tar.xz mirror://gentoo/texlive-module-moderncv-2016.tar.xz mirror://gentoo/texlive-module-moderntimeline-2016.tar.xz mirror://gentoo/texlive-module-modref-2016.tar.xz mirror://gentoo/texlive-module-modroman-2016.tar.xz mirror://gentoo/texlive-module-monofill-2016.tar.xz mirror://gentoo/texlive-module-moodle-2016.tar.xz mirror://gentoo/texlive-module-moreenum-2016.tar.xz mirror://gentoo/texlive-module-morefloats-2016.tar.xz mirror://gentoo/texlive-module-morehype-2016.tar.xz mirror://gentoo/texlive-module-moresize-2016.tar.xz mirror://gentoo/texlive-module-moreverb-2016.tar.xz mirror://gentoo/texlive-module-morewrites-2016.tar.xz mirror://gentoo/texlive-module-movie15-2016.tar.xz mirror://gentoo/texlive-module-mparhack-2016.tar.xz mirror://gentoo/texlive-module-mpostinl-2016.tar.xz mirror://gentoo/texlive-module-msc-2016.tar.xz mirror://gentoo/texlive-module-msg-2016.tar.xz mirror://gentoo/texlive-module-mslapa-2016.tar.xz mirror://gentoo/texlive-module-mtgreek-2016.tar.xz mirror://gentoo/texlive-module-multenum-2016.tar.xz mirror://gentoo/texlive-module-multiaudience-2016.tar.xz mirror://gentoo/texlive-module-multibbl-2016.tar.xz mirror://gentoo/texlive-module-multicap-2016.tar.xz mirror://gentoo/texlive-module-multidef-2016.tar.xz mirror://gentoo/texlive-module-multienv-2016.tar.xz mirror://gentoo/texlive-module-multiexpand-2016.tar.xz mirror://gentoo/texlive-module-multirow-2016.tar.xz mirror://gentoo/texlive-module-mversion-2016.tar.xz mirror://gentoo/texlive-module-mwe-2016.tar.xz mirror://gentoo/texlive-module-mycv-2016.tar.xz mirror://gentoo/texlive-module-mylatexformat-2016.tar.xz mirror://gentoo/texlive-module-nag-2016.tar.xz mirror://gentoo/texlive-module-nameauth-2016.tar.xz mirror://gentoo/texlive-module-namespc-2016.tar.xz mirror://gentoo/texlive-module-ncclatex-2016.tar.xz mirror://gentoo/texlive-module-ncctools-2016.tar.xz mirror://gentoo/texlive-module-needspace-2016.tar.xz mirror://gentoo/texlive-module-nestquot-2016.tar.xz mirror://gentoo/texlive-module-newcommand-2016.tar.xz mirror://gentoo/texlive-module-newenviron-2016.tar.xz mirror://gentoo/texlive-module-newfile-2016.tar.xz mirror://gentoo/texlive-module-newlfm-2016.tar.xz mirror://gentoo/texlive-module-newspaper-2016.tar.xz mirror://gentoo/texlive-module-newunicodechar-2016.tar.xz mirror://gentoo/texlive-module-newvbtm-2016.tar.xz mirror://gentoo/texlive-module-newverbs-2016.tar.xz mirror://gentoo/texlive-module-nextpage-2016.tar.xz mirror://gentoo/texlive-module-nfssext-cfr-2016.tar.xz mirror://gentoo/texlive-module-nicefilelist-2016.tar.xz mirror://gentoo/texlive-module-niceframe-2016.tar.xz mirror://gentoo/texlive-module-nicetext-2016.tar.xz mirror://gentoo/texlive-module-nlctdoc-2016.tar.xz mirror://gentoo/texlive-module-noconflict-2016.tar.xz mirror://gentoo/texlive-module-noindentafter-2016.tar.xz mirror://gentoo/texlive-module-noitcrul-2016.tar.xz mirror://gentoo/texlive-module-nolbreaks-2016.tar.xz mirror://gentoo/texlive-module-nomencl-2016.tar.xz mirror://gentoo/texlive-module-nomentbl-2016.tar.xz mirror://gentoo/texlive-module-nonfloat-2016.tar.xz mirror://gentoo/texlive-module-nonumonpart-2016.tar.xz mirror://gentoo/texlive-module-nopageno-2016.tar.xz mirror://gentoo/texlive-module-normalcolor-2016.tar.xz mirror://gentoo/texlive-module-notes-2016.tar.xz mirror://gentoo/texlive-module-notespages-2016.tar.xz mirror://gentoo/texlive-module-notoccite-2016.tar.xz mirror://gentoo/texlive-module-nowidow-2016.tar.xz mirror://gentoo/texlive-module-nox-2016.tar.xz mirror://gentoo/texlive-module-ntheorem-2016.tar.xz mirror://gentoo/texlive-module-numberedblock-2016.tar.xz mirror://gentoo/texlive-module-numname-2016.tar.xz mirror://gentoo/texlive-module-numprint-2016.tar.xz mirror://gentoo/texlive-module-ocg-p-2016.tar.xz mirror://gentoo/texlive-module-ocgx-2016.tar.xz mirror://gentoo/texlive-module-ocgx2-2016.tar.xz mirror://gentoo/texlive-module-ocr-latex-2016.tar.xz mirror://gentoo/texlive-module-octavo-2016.tar.xz mirror://gentoo/texlive-module-oldstyle-2016.tar.xz mirror://gentoo/texlive-module-onlyamsmath-2016.tar.xz mirror://gentoo/texlive-module-opcit-2016.tar.xz mirror://gentoo/texlive-module-optidef-2016.tar.xz mirror://gentoo/texlive-module-optional-2016.tar.xz mirror://gentoo/texlive-module-options-2016.tar.xz mirror://gentoo/texlive-module-outline-2016.tar.xz mirror://gentoo/texlive-module-outliner-2016.tar.xz mirror://gentoo/texlive-module-outlines-2016.tar.xz mirror://gentoo/texlive-module-overlays-2016.tar.xz mirror://gentoo/texlive-module-overpic-2016.tar.xz mirror://gentoo/texlive-module-pagecolor-2016.tar.xz mirror://gentoo/texlive-module-pagecont-2016.tar.xz mirror://gentoo/texlive-module-pagenote-2016.tar.xz mirror://gentoo/texlive-module-pagerange-2016.tar.xz mirror://gentoo/texlive-module-pageslts-2016.tar.xz mirror://gentoo/texlive-module-paper-2016.tar.xz mirror://gentoo/texlive-module-papercdcase-2016.tar.xz mirror://gentoo/texlive-module-papermas-2016.tar.xz mirror://gentoo/texlive-module-papertex-2016.tar.xz mirror://gentoo/texlive-module-paracol-2016.tar.xz mirror://gentoo/texlive-module-parades-2016.tar.xz mirror://gentoo/texlive-module-paralist-2016.tar.xz mirror://gentoo/texlive-module-paresse-2016.tar.xz mirror://gentoo/texlive-module-parnotes-2016.tar.xz mirror://gentoo/texlive-module-parselines-2016.tar.xz mirror://gentoo/texlive-module-pas-cours-2016.tar.xz mirror://gentoo/texlive-module-pas-cv-2016.tar.xz mirror://gentoo/texlive-module-pas-tableur-2016.tar.xz mirror://gentoo/texlive-module-patch-2016.tar.xz mirror://gentoo/texlive-module-patchcmd-2016.tar.xz mirror://gentoo/texlive-module-pauldoc-2016.tar.xz mirror://gentoo/texlive-module-pawpict-2016.tar.xz mirror://gentoo/texlive-module-pbox-2016.tar.xz mirror://gentoo/texlive-module-pbsheet-2016.tar.xz mirror://gentoo/texlive-module-pdf14-2016.tar.xz mirror://gentoo/texlive-module-pdfcomment-2016.tar.xz mirror://gentoo/texlive-module-pdfcprot-2016.tar.xz mirror://gentoo/texlive-module-pdfmarginpar-2016.tar.xz mirror://gentoo/texlive-module-pdfpagediff-2016.tar.xz mirror://gentoo/texlive-module-pdfscreen-2016.tar.xz mirror://gentoo/texlive-module-pdfslide-2016.tar.xz mirror://gentoo/texlive-module-pdfsync-2016.tar.xz mirror://gentoo/texlive-module-pdfwin-2016.tar.xz mirror://gentoo/texlive-module-pdfx-2016.tar.xz mirror://gentoo/texlive-module-pecha-2016.tar.xz mirror://gentoo/texlive-module-perltex-2016.tar.xz mirror://gentoo/texlive-module-permute-2016.tar.xz mirror://gentoo/texlive-module-petiteannonce-2016.tar.xz mirror://gentoo/texlive-module-phffullpagefigure-2016.tar.xz mirror://gentoo/texlive-module-phfnote-2016.tar.xz mirror://gentoo/texlive-module-phfparen-2016.tar.xz mirror://gentoo/texlive-module-phfqit-2016.tar.xz mirror://gentoo/texlive-module-phfquotetext-2016.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark-2016.tar.xz mirror://gentoo/texlive-module-phfthm-2016.tar.xz mirror://gentoo/texlive-module-philex-2016.tar.xz mirror://gentoo/texlive-module-phonenumbers-2016.tar.xz mirror://gentoo/texlive-module-photo-2016.tar.xz mirror://gentoo/texlive-module-piff-2016.tar.xz mirror://gentoo/texlive-module-pkgloader-2016.tar.xz mirror://gentoo/texlive-module-placeins-2016.tar.xz mirror://gentoo/texlive-module-plantslabels-2016.tar.xz mirror://gentoo/texlive-module-plates-2016.tar.xz mirror://gentoo/texlive-module-plweb-2016.tar.xz mirror://gentoo/texlive-module-polynom-2016.tar.xz mirror://gentoo/texlive-module-polynomial-2016.tar.xz mirror://gentoo/texlive-module-polytable-2016.tar.xz mirror://gentoo/texlive-module-postcards-2016.tar.xz mirror://gentoo/texlive-module-poster-mac-2016.tar.xz mirror://gentoo/texlive-module-ppr-prv-2016.tar.xz mirror://gentoo/texlive-module-preprint-2016.tar.xz mirror://gentoo/texlive-module-pressrelease-2016.tar.xz mirror://gentoo/texlive-module-prettyref-2016.tar.xz mirror://gentoo/texlive-module-preview-2016.tar.xz mirror://gentoo/texlive-module-printlen-2016.tar.xz mirror://gentoo/texlive-module-probsoln-2016.tar.xz mirror://gentoo/texlive-module-program-2016.tar.xz mirror://gentoo/texlive-module-progress-2016.tar.xz mirror://gentoo/texlive-module-progressbar-2016.tar.xz mirror://gentoo/texlive-module-proofread-2016.tar.xz mirror://gentoo/texlive-module-properties-2016.tar.xz mirror://gentoo/texlive-module-prosper-2016.tar.xz mirror://gentoo/texlive-module-protex-2016.tar.xz mirror://gentoo/texlive-module-protocol-2016.tar.xz mirror://gentoo/texlive-module-psfragx-2016.tar.xz mirror://gentoo/texlive-module-pst-pdf-2016.tar.xz mirror://gentoo/texlive-module-pstool-2016.tar.xz mirror://gentoo/texlive-module-pstring-2016.tar.xz mirror://gentoo/texlive-module-pxgreeks-2016.tar.xz mirror://gentoo/texlive-module-python-2016.tar.xz mirror://gentoo/texlive-module-qcm-2016.tar.xz mirror://gentoo/texlive-module-qstest-2016.tar.xz mirror://gentoo/texlive-module-qsymbols-2016.tar.xz mirror://gentoo/texlive-module-quicktype-2016.tar.xz mirror://gentoo/texlive-module-quotchap-2016.tar.xz mirror://gentoo/texlive-module-quoting-2016.tar.xz mirror://gentoo/texlive-module-quotmark-2016.tar.xz mirror://gentoo/texlive-module-ran_toks-2016.tar.xz mirror://gentoo/texlive-module-randtext-2016.tar.xz mirror://gentoo/texlive-module-rccol-2016.tar.xz mirror://gentoo/texlive-module-rcs-multi-2016.tar.xz mirror://gentoo/texlive-module-rcsinfo-2016.tar.xz mirror://gentoo/texlive-module-readarray-2016.tar.xz mirror://gentoo/texlive-module-realboxes-2016.tar.xz mirror://gentoo/texlive-module-recipe-2016.tar.xz mirror://gentoo/texlive-module-recipebook-2016.tar.xz mirror://gentoo/texlive-module-recipecard-2016.tar.xz mirror://gentoo/texlive-module-rectopma-2016.tar.xz mirror://gentoo/texlive-module-refcheck-2016.tar.xz mirror://gentoo/texlive-module-refenums-2016.tar.xz mirror://gentoo/texlive-module-reflectgraphics-2016.tar.xz mirror://gentoo/texlive-module-refman-2016.tar.xz mirror://gentoo/texlive-module-refstyle-2016.tar.xz mirror://gentoo/texlive-module-regcount-2016.tar.xz mirror://gentoo/texlive-module-regexpatch-2016.tar.xz mirror://gentoo/texlive-module-register-2016.tar.xz mirror://gentoo/texlive-module-regstats-2016.tar.xz mirror://gentoo/texlive-module-relenc-2016.tar.xz mirror://gentoo/texlive-module-relsize-2016.tar.xz mirror://gentoo/texlive-module-repeatindex-2016.tar.xz mirror://gentoo/texlive-module-repltext-2016.tar.xz mirror://gentoo/texlive-module-rjlparshap-2016.tar.xz mirror://gentoo/texlive-module-rlepsf-2016.tar.xz mirror://gentoo/texlive-module-rmpage-2016.tar.xz mirror://gentoo/texlive-module-robustcommand-2016.tar.xz mirror://gentoo/texlive-module-robustindex-2016.tar.xz mirror://gentoo/texlive-module-romanbar-2016.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber-2016.tar.xz mirror://gentoo/texlive-module-romanneg-2016.tar.xz mirror://gentoo/texlive-module-romannum-2016.tar.xz mirror://gentoo/texlive-module-rotfloat-2016.tar.xz mirror://gentoo/texlive-module-rotpages-2016.tar.xz mirror://gentoo/texlive-module-roundbox-2016.tar.xz mirror://gentoo/texlive-module-rterface-2016.tar.xz mirror://gentoo/texlive-module-rtkinenc-2016.tar.xz mirror://gentoo/texlive-module-rulercompass-2016.tar.xz mirror://gentoo/texlive-module-rvwrite-2016.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut-2016.tar.xz mirror://gentoo/texlive-module-sauerj-2016.tar.xz mirror://gentoo/texlive-module-savefnmark-2016.tar.xz mirror://gentoo/texlive-module-savesym-2016.tar.xz mirror://gentoo/texlive-module-savetrees-2016.tar.xz mirror://gentoo/texlive-module-scale-2016.tar.xz mirror://gentoo/texlive-module-scalebar-2016.tar.xz mirror://gentoo/texlive-module-scalerel-2016.tar.xz mirror://gentoo/texlive-module-scanpages-2016.tar.xz mirror://gentoo/texlive-module-scrlttr2copy-2016.tar.xz mirror://gentoo/texlive-module-sdrt-2016.tar.xz mirror://gentoo/texlive-module-secdot-2016.tar.xz mirror://gentoo/texlive-module-sectionbox-2016.tar.xz mirror://gentoo/texlive-module-sectsty-2016.tar.xz mirror://gentoo/texlive-module-seealso-2016.tar.xz mirror://gentoo/texlive-module-selectp-2016.tar.xz mirror://gentoo/texlive-module-semantic-2016.tar.xz mirror://gentoo/texlive-module-semantic-markup-2016.tar.xz mirror://gentoo/texlive-module-semioneside-2016.tar.xz mirror://gentoo/texlive-module-semproc-2016.tar.xz mirror://gentoo/texlive-module-sepfootnotes-2016.tar.xz mirror://gentoo/texlive-module-seqsplit-2016.tar.xz mirror://gentoo/texlive-module-sf298-2016.tar.xz mirror://gentoo/texlive-module-sffms-2016.tar.xz mirror://gentoo/texlive-module-sfmath-2016.tar.xz mirror://gentoo/texlive-module-shadethm-2016.tar.xz mirror://gentoo/texlive-module-shadow-2016.tar.xz mirror://gentoo/texlive-module-shadowtext-2016.tar.xz mirror://gentoo/texlive-module-shapepar-2016.tar.xz mirror://gentoo/texlive-module-shdoc-2016.tar.xz mirror://gentoo/texlive-module-shipunov-2016.tar.xz mirror://gentoo/texlive-module-shorttoc-2016.tar.xz mirror://gentoo/texlive-module-show2e-2016.tar.xz mirror://gentoo/texlive-module-showcharinbox-2016.tar.xz mirror://gentoo/texlive-module-showdim-2016.tar.xz mirror://gentoo/texlive-module-showexpl-2016.tar.xz mirror://gentoo/texlive-module-showlabels-2016.tar.xz mirror://gentoo/texlive-module-sidecap-2016.tar.xz mirror://gentoo/texlive-module-sidenotes-2016.tar.xz mirror://gentoo/texlive-module-silence-2016.tar.xz mirror://gentoo/texlive-module-simplecd-2016.tar.xz mirror://gentoo/texlive-module-simplecv-2016.tar.xz mirror://gentoo/texlive-module-sitem-2016.tar.xz mirror://gentoo/texlive-module-skb-2016.tar.xz mirror://gentoo/texlive-module-skdoc-2016.tar.xz mirror://gentoo/texlive-module-skeycommand-2016.tar.xz mirror://gentoo/texlive-module-skeyval-2016.tar.xz mirror://gentoo/texlive-module-skrapport-2016.tar.xz mirror://gentoo/texlive-module-slantsc-2016.tar.xz mirror://gentoo/texlive-module-smalltableof-2016.tar.xz mirror://gentoo/texlive-module-smartunits-2016.tar.xz mirror://gentoo/texlive-module-smartref-2016.tar.xz mirror://gentoo/texlive-module-snapshot-2016.tar.xz mirror://gentoo/texlive-module-snotez-2016.tar.xz mirror://gentoo/texlive-module-soul-2016.tar.xz mirror://gentoo/texlive-module-sparklines-2016.tar.xz mirror://gentoo/texlive-module-sphack-2016.tar.xz mirror://gentoo/texlive-module-splitindex-2016.tar.xz mirror://gentoo/texlive-module-spot-2016.tar.xz mirror://gentoo/texlive-module-spotcolor-2016.tar.xz mirror://gentoo/texlive-module-spreadtab-2016.tar.xz mirror://gentoo/texlive-module-spverbatim-2016.tar.xz mirror://gentoo/texlive-module-srbook-mem-2016.tar.xz mirror://gentoo/texlive-module-srcltx-2016.tar.xz mirror://gentoo/texlive-module-sseq-2016.tar.xz mirror://gentoo/texlive-module-sslides-2016.tar.xz mirror://gentoo/texlive-module-stack-2016.tar.xz mirror://gentoo/texlive-module-stackengine-2016.tar.xz mirror://gentoo/texlive-module-standalone-2016.tar.xz mirror://gentoo/texlive-module-statistik-2016.tar.xz mirror://gentoo/texlive-module-stdclsdv-2016.tar.xz mirror://gentoo/texlive-module-stdpage-2016.tar.xz mirror://gentoo/texlive-module-stex-2016.tar.xz mirror://gentoo/texlive-module-storebox-2016.tar.xz mirror://gentoo/texlive-module-storecmd-2016.tar.xz mirror://gentoo/texlive-module-stringstrings-2016.tar.xz mirror://gentoo/texlive-module-sttools-2016.tar.xz mirror://gentoo/texlive-module-stubs-2016.tar.xz mirror://gentoo/texlive-module-subdepth-2016.tar.xz mirror://gentoo/texlive-module-subeqn-2016.tar.xz mirror://gentoo/texlive-module-subeqnarray-2016.tar.xz mirror://gentoo/texlive-module-subfigmat-2016.tar.xz mirror://gentoo/texlive-module-subfigure-2016.tar.xz mirror://gentoo/texlive-module-subfiles-2016.tar.xz mirror://gentoo/texlive-module-subfloat-2016.tar.xz mirror://gentoo/texlive-module-substitutefont-2016.tar.xz mirror://gentoo/texlive-module-substr-2016.tar.xz mirror://gentoo/texlive-module-supertabular-2016.tar.xz mirror://gentoo/texlive-module-svg-2016.tar.xz mirror://gentoo/texlive-module-svgcolor-2016.tar.xz mirror://gentoo/texlive-module-svn-2016.tar.xz mirror://gentoo/texlive-module-svn-multi-2016.tar.xz mirror://gentoo/texlive-module-svn-prov-2016.tar.xz mirror://gentoo/texlive-module-syntax-2016.tar.xz mirror://gentoo/texlive-module-syntrace-2016.tar.xz mirror://gentoo/texlive-module-synttree-2016.tar.xz mirror://gentoo/texlive-module-tabfigures-2016.tar.xz mirror://gentoo/texlive-module-tableaux-2016.tar.xz mirror://gentoo/texlive-module-tablefootnote-2016.tar.xz mirror://gentoo/texlive-module-tableof-2016.tar.xz mirror://gentoo/texlive-module-tablestyles-2016.tar.xz mirror://gentoo/texlive-module-tablists-2016.tar.xz mirror://gentoo/texlive-module-tabls-2016.tar.xz mirror://gentoo/texlive-module-tabstackengine-2016.tar.xz mirror://gentoo/texlive-module-tabto-ltx-2016.tar.xz mirror://gentoo/texlive-module-tabu-2016.tar.xz mirror://gentoo/texlive-module-tabularborder-2016.tar.xz mirror://gentoo/texlive-module-tabularcalc-2016.tar.xz mirror://gentoo/texlive-module-tabularew-2016.tar.xz mirror://gentoo/texlive-module-tabulary-2016.tar.xz mirror://gentoo/texlive-module-tagging-2016.tar.xz mirror://gentoo/texlive-module-tagpair-2016.tar.xz mirror://gentoo/texlive-module-talk-2016.tar.xz mirror://gentoo/texlive-module-tamefloats-2016.tar.xz mirror://gentoo/texlive-module-tasks-2016.tar.xz mirror://gentoo/texlive-module-tcldoc-2016.tar.xz mirror://gentoo/texlive-module-tcolorbox-2016.tar.xz mirror://gentoo/texlive-module-tdclock-2016.tar.xz mirror://gentoo/texlive-module-technics-2016.tar.xz mirror://gentoo/texlive-module-ted-2016.tar.xz mirror://gentoo/texlive-module-templatetools-2016.tar.xz mirror://gentoo/texlive-module-termcal-2016.tar.xz mirror://gentoo/texlive-module-termlist-2016.tar.xz mirror://gentoo/texlive-module-testhyphens-2016.tar.xz mirror://gentoo/texlive-module-testidx-2016.tar.xz mirror://gentoo/texlive-module-tex-label-2016.tar.xz mirror://gentoo/texlive-module-texlogos-2016.tar.xz mirror://gentoo/texlive-module-texmate-2016.tar.xz mirror://gentoo/texlive-module-texments-2016.tar.xz mirror://gentoo/texlive-module-texpower-2016.tar.xz mirror://gentoo/texlive-module-texshade-2016.tar.xz mirror://gentoo/texlive-module-texvc-2016.tar.xz mirror://gentoo/texlive-module-textfit-2016.tar.xz mirror://gentoo/texlive-module-textgreek-2016.tar.xz mirror://gentoo/texlive-module-textmerg-2016.tar.xz mirror://gentoo/texlive-module-textpos-2016.tar.xz mirror://gentoo/texlive-module-theoremref-2016.tar.xz mirror://gentoo/texlive-module-thinsp-2016.tar.xz mirror://gentoo/texlive-module-thmtools-2016.tar.xz mirror://gentoo/texlive-module-threadcol-2016.tar.xz mirror://gentoo/texlive-module-threeparttable-2016.tar.xz mirror://gentoo/texlive-module-threeparttablex-2016.tar.xz mirror://gentoo/texlive-module-thumb-2016.tar.xz mirror://gentoo/texlive-module-thumbs-2016.tar.xz mirror://gentoo/texlive-module-thumby-2016.tar.xz mirror://gentoo/texlive-module-ticket-2016.tar.xz mirror://gentoo/texlive-module-titlecaps-2016.tar.xz mirror://gentoo/texlive-module-titlefoot-2016.tar.xz mirror://gentoo/texlive-module-titlepic-2016.tar.xz mirror://gentoo/texlive-module-titleref-2016.tar.xz mirror://gentoo/texlive-module-titlesec-2016.tar.xz mirror://gentoo/texlive-module-titling-2016.tar.xz mirror://gentoo/texlive-module-tocbibind-2016.tar.xz mirror://gentoo/texlive-module-tocdata-2016.tar.xz mirror://gentoo/texlive-module-tocloft-2016.tar.xz mirror://gentoo/texlive-module-tocvsec2-2016.tar.xz mirror://gentoo/texlive-module-todo-2016.tar.xz mirror://gentoo/texlive-module-todonotes-2016.tar.xz mirror://gentoo/texlive-module-tokenizer-2016.tar.xz mirror://gentoo/texlive-module-toolbox-2016.tar.xz mirror://gentoo/texlive-module-topfloat-2016.tar.xz mirror://gentoo/texlive-module-totcount-2016.tar.xz mirror://gentoo/texlive-module-totpages-2016.tar.xz mirror://gentoo/texlive-module-translations-2016.tar.xz mirror://gentoo/texlive-module-trfsigns-2016.tar.xz mirror://gentoo/texlive-module-trimspaces-2016.tar.xz mirror://gentoo/texlive-module-trivfloat-2016.tar.xz mirror://gentoo/texlive-module-trsym-2016.tar.xz mirror://gentoo/texlive-module-truncate-2016.tar.xz mirror://gentoo/texlive-module-tucv-2016.tar.xz mirror://gentoo/texlive-module-turnthepage-2016.tar.xz mirror://gentoo/texlive-module-twoinone-2016.tar.xz mirror://gentoo/texlive-module-twoup-2016.tar.xz mirror://gentoo/texlive-module-txgreeks-2016.tar.xz mirror://gentoo/texlive-module-type1cm-2016.tar.xz mirror://gentoo/texlive-module-typed-checklist-2016.tar.xz mirror://gentoo/texlive-module-typeface-2016.tar.xz mirror://gentoo/texlive-module-typogrid-2016.tar.xz mirror://gentoo/texlive-module-uassign-2016.tar.xz mirror://gentoo/texlive-module-ucs-2016.tar.xz mirror://gentoo/texlive-module-uebungsblatt-2016.tar.xz mirror://gentoo/texlive-module-umoline-2016.tar.xz mirror://gentoo/texlive-module-underlin-2016.tar.xz mirror://gentoo/texlive-module-underoverlap-2016.tar.xz mirror://gentoo/texlive-module-undolabl-2016.tar.xz mirror://gentoo/texlive-module-units-2016.tar.xz mirror://gentoo/texlive-module-unravel-2016.tar.xz mirror://gentoo/texlive-module-upmethodology-2016.tar.xz mirror://gentoo/texlive-module-upquote-2016.tar.xz mirror://gentoo/texlive-module-uri-2016.tar.xz mirror://gentoo/texlive-module-ushort-2016.tar.xz mirror://gentoo/texlive-module-uspace-2016.tar.xz mirror://gentoo/texlive-module-uwmslide-2016.tar.xz mirror://gentoo/texlive-module-varindex-2016.tar.xz mirror://gentoo/texlive-module-varsfromjobname-2016.tar.xz mirror://gentoo/texlive-module-varwidth-2016.tar.xz mirror://gentoo/texlive-module-vdmlisting-2016.tar.xz mirror://gentoo/texlive-module-verbasef-2016.tar.xz mirror://gentoo/texlive-module-verbatimbox-2016.tar.xz mirror://gentoo/texlive-module-verbatimcopy-2016.tar.xz mirror://gentoo/texlive-module-verbdef-2016.tar.xz mirror://gentoo/texlive-module-verbments-2016.tar.xz mirror://gentoo/texlive-module-version-2016.tar.xz mirror://gentoo/texlive-module-versions-2016.tar.xz mirror://gentoo/texlive-module-versonotes-2016.tar.xz mirror://gentoo/texlive-module-vertbars-2016.tar.xz mirror://gentoo/texlive-module-vgrid-2016.tar.xz mirror://gentoo/texlive-module-vhistory-2016.tar.xz mirror://gentoo/texlive-module-vmargin-2016.tar.xz mirror://gentoo/texlive-module-volumes-2016.tar.xz mirror://gentoo/texlive-module-vpe-2016.tar.xz mirror://gentoo/texlive-module-vruler-2016.tar.xz mirror://gentoo/texlive-module-vwcol-2016.tar.xz mirror://gentoo/texlive-module-wallpaper-2016.tar.xz mirror://gentoo/texlive-module-warning-2016.tar.xz mirror://gentoo/texlive-module-warpcol-2016.tar.xz mirror://gentoo/texlive-module-was-2016.tar.xz mirror://gentoo/texlive-module-widetable-2016.tar.xz mirror://gentoo/texlive-module-williams-2016.tar.xz mirror://gentoo/texlive-module-withargs-2016.tar.xz mirror://gentoo/texlive-module-wordcount-2016.tar.xz mirror://gentoo/texlive-module-wordlike-2016.tar.xz mirror://gentoo/texlive-module-wrapfig-2016.tar.xz mirror://gentoo/texlive-module-wtref-2016.tar.xz mirror://gentoo/texlive-module-xargs-2016.tar.xz mirror://gentoo/texlive-module-xassoccnt-2016.tar.xz mirror://gentoo/texlive-module-xcntperchap-2016.tar.xz mirror://gentoo/texlive-module-xcolor-material-2016.tar.xz mirror://gentoo/texlive-module-xcolor-solarized-2016.tar.xz mirror://gentoo/texlive-module-xcomment-2016.tar.xz mirror://gentoo/texlive-module-xdoc-2016.tar.xz mirror://gentoo/texlive-module-xellipsis-2016.tar.xz mirror://gentoo/texlive-module-xfor-2016.tar.xz mirror://gentoo/texlive-module-xhfill-2016.tar.xz mirror://gentoo/texlive-module-xifthen-2016.tar.xz mirror://gentoo/texlive-module-xint-2016.tar.xz mirror://gentoo/texlive-module-xmpincl-2016.tar.xz mirror://gentoo/texlive-module-xnewcommand-2016.tar.xz mirror://gentoo/texlive-module-xoptarg-2016.tar.xz mirror://gentoo/texlive-module-xpatch-2016.tar.xz mirror://gentoo/texlive-module-xpeek-2016.tar.xz mirror://gentoo/texlive-module-xprintlen-2016.tar.xz mirror://gentoo/texlive-module-xpunctuate-2016.tar.xz mirror://gentoo/texlive-module-xsavebox-2016.tar.xz mirror://gentoo/texlive-module-xstring-2016.tar.xz mirror://gentoo/texlive-module-xtab-2016.tar.xz mirror://gentoo/texlive-module-xwatermark-2016.tar.xz mirror://gentoo/texlive-module-xytree-2016.tar.xz mirror://gentoo/texlive-module-yafoot-2016.tar.xz mirror://gentoo/texlive-module-yaletter-2016.tar.xz mirror://gentoo/texlive-module-yagusylo-2016.tar.xz mirror://gentoo/texlive-module-ycbook-2016.tar.xz mirror://gentoo/texlive-module-ydoc-2016.tar.xz mirror://gentoo/texlive-module-yplan-2016.tar.xz mirror://gentoo/texlive-module-zed-csp-2016.tar.xz mirror://gentoo/texlive-module-ziffer-2016.tar.xz mirror://gentoo/texlive-module-zwgetfdate-2016.tar.xz mirror://gentoo/texlive-module-zwpagelayout-2016.tar.xz mirror://gentoo/texlive-module-collection-latexextra-2016.tar.xz doc? ( mirror://gentoo/texlive-module-2up.doc-2016.tar.xz mirror://gentoo/texlive-module-ESIEEcv.doc-2016.tar.xz mirror://gentoo/texlive-module-GS1.doc-2016.tar.xz mirror://gentoo/texlive-module-HA-prosper.doc-2016.tar.xz mirror://gentoo/texlive-module-Tabbing.doc-2016.tar.xz mirror://gentoo/texlive-module-a0poster.doc-2016.tar.xz mirror://gentoo/texlive-module-a4wide.doc-2016.tar.xz mirror://gentoo/texlive-module-a5comb.doc-2016.tar.xz mirror://gentoo/texlive-module-abraces.doc-2016.tar.xz mirror://gentoo/texlive-module-abstract.doc-2016.tar.xz mirror://gentoo/texlive-module-achemso.doc-2016.tar.xz mirror://gentoo/texlive-module-acro.doc-2016.tar.xz mirror://gentoo/texlive-module-acronym.doc-2016.tar.xz mirror://gentoo/texlive-module-acroterm.doc-2016.tar.xz mirror://gentoo/texlive-module-actuarialangle.doc-2016.tar.xz mirror://gentoo/texlive-module-addfont.doc-2016.tar.xz mirror://gentoo/texlive-module-addlines.doc-2016.tar.xz mirror://gentoo/texlive-module-adjmulticol.doc-2016.tar.xz mirror://gentoo/texlive-module-adjustbox.doc-2016.tar.xz mirror://gentoo/texlive-module-adrconv.doc-2016.tar.xz mirror://gentoo/texlive-module-advdate.doc-2016.tar.xz mirror://gentoo/texlive-module-akktex.doc-2016.tar.xz mirror://gentoo/texlive-module-akletter.doc-2016.tar.xz mirror://gentoo/texlive-module-alertmessage.doc-2016.tar.xz mirror://gentoo/texlive-module-alnumsec.doc-2016.tar.xz mirror://gentoo/texlive-module-alterqcm.doc-2016.tar.xz mirror://gentoo/texlive-module-altfont.doc-2016.tar.xz mirror://gentoo/texlive-module-amsaddr.doc-2016.tar.xz mirror://gentoo/texlive-module-animate.doc-2016.tar.xz mirror://gentoo/texlive-module-anonchap.doc-2016.tar.xz mirror://gentoo/texlive-module-answers.doc-2016.tar.xz mirror://gentoo/texlive-module-anyfontsize.doc-2016.tar.xz mirror://gentoo/texlive-module-appendix.doc-2016.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer.doc-2016.tar.xz mirror://gentoo/texlive-module-apptools.doc-2016.tar.xz mirror://gentoo/texlive-module-arcs.doc-2016.tar.xz mirror://gentoo/texlive-module-arrayjobx.doc-2016.tar.xz mirror://gentoo/texlive-module-arraysort.doc-2016.tar.xz mirror://gentoo/texlive-module-arydshln.doc-2016.tar.xz mirror://gentoo/texlive-module-asciilist.doc-2016.tar.xz mirror://gentoo/texlive-module-assignment.doc-2016.tar.xz mirror://gentoo/texlive-module-assoccnt.doc-2016.tar.xz mirror://gentoo/texlive-module-attachfile.doc-2016.tar.xz mirror://gentoo/texlive-module-aurl.doc-2016.tar.xz mirror://gentoo/texlive-module-authoraftertitle.doc-2016.tar.xz mirror://gentoo/texlive-module-authorindex.doc-2016.tar.xz mirror://gentoo/texlive-module-autonum.doc-2016.tar.xz mirror://gentoo/texlive-module-autopdf.doc-2016.tar.xz mirror://gentoo/texlive-module-avremu.doc-2016.tar.xz mirror://gentoo/texlive-module-background.doc-2016.tar.xz mirror://gentoo/texlive-module-bankstatement.doc-2016.tar.xz mirror://gentoo/texlive-module-bashful.doc-2016.tar.xz mirror://gentoo/texlive-module-basicarith.doc-2016.tar.xz mirror://gentoo/texlive-module-bchart.doc-2016.tar.xz mirror://gentoo/texlive-module-beamer2thesis.doc-2016.tar.xz mirror://gentoo/texlive-module-beameraudience.doc-2016.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.doc-2016.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes.doc-2016.tar.xz mirror://gentoo/texlive-module-beamerposter.doc-2016.tar.xz mirror://gentoo/texlive-module-beamersubframe.doc-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.doc-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm.doc-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt.doc-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.doc-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh.doc-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc.doc-2016.tar.xz mirror://gentoo/texlive-module-beamerthemenirma.doc-2016.tar.xz mirror://gentoo/texlive-module-beton.doc-2016.tar.xz mirror://gentoo/texlive-module-bewerbung.doc-2016.tar.xz mirror://gentoo/texlive-module-bez123.doc-2016.tar.xz mirror://gentoo/texlive-module-bezos.doc-2016.tar.xz mirror://gentoo/texlive-module-bhcexam.doc-2016.tar.xz mirror://gentoo/texlive-module-bibletext.doc-2016.tar.xz mirror://gentoo/texlive-module-bigfoot.doc-2016.tar.xz mirror://gentoo/texlive-module-bigints.doc-2016.tar.xz mirror://gentoo/texlive-module-bizcard.doc-2016.tar.xz mirror://gentoo/texlive-module-blindtext.doc-2016.tar.xz mirror://gentoo/texlive-module-blkarray.doc-2016.tar.xz mirror://gentoo/texlive-module-block.doc-2016.tar.xz mirror://gentoo/texlive-module-bnumexpr.doc-2016.tar.xz mirror://gentoo/texlive-module-boites.doc-2016.tar.xz mirror://gentoo/texlive-module-bold-extra.doc-2016.tar.xz mirror://gentoo/texlive-module-bookcover.doc-2016.tar.xz mirror://gentoo/texlive-module-bookest.doc-2016.tar.xz mirror://gentoo/texlive-module-booklet.doc-2016.tar.xz mirror://gentoo/texlive-module-boolexpr.doc-2016.tar.xz mirror://gentoo/texlive-module-bophook.doc-2016.tar.xz mirror://gentoo/texlive-module-boxedminipage.doc-2016.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.doc-2016.tar.xz mirror://gentoo/texlive-module-boxhandler.doc-2016.tar.xz mirror://gentoo/texlive-module-bracketkey.doc-2016.tar.xz mirror://gentoo/texlive-module-braket.doc-2016.tar.xz mirror://gentoo/texlive-module-breakurl.doc-2016.tar.xz mirror://gentoo/texlive-module-bullcntr.doc-2016.tar.xz mirror://gentoo/texlive-module-bussproofs.doc-2016.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer.doc-2016.tar.xz mirror://gentoo/texlive-module-bxdvidriver.doc-2016.tar.xz mirror://gentoo/texlive-module-bxenclose.doc-2016.tar.xz mirror://gentoo/texlive-module-bxnewfont.doc-2016.tar.xz mirror://gentoo/texlive-module-bxpapersize.doc-2016.tar.xz mirror://gentoo/texlive-module-bxpdfver.doc-2016.tar.xz mirror://gentoo/texlive-module-calcage.doc-2016.tar.xz mirror://gentoo/texlive-module-calctab.doc-2016.tar.xz mirror://gentoo/texlive-module-calculator.doc-2016.tar.xz mirror://gentoo/texlive-module-calrsfs.doc-2016.tar.xz mirror://gentoo/texlive-module-cals.doc-2016.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy.doc-2016.tar.xz mirror://gentoo/texlive-module-cancel.doc-2016.tar.xz mirror://gentoo/texlive-module-canoniclayout.doc-2016.tar.xz mirror://gentoo/texlive-module-capt-of.doc-2016.tar.xz mirror://gentoo/texlive-module-captcont.doc-2016.tar.xz mirror://gentoo/texlive-module-captdef.doc-2016.tar.xz mirror://gentoo/texlive-module-carbohydrates.doc-2016.tar.xz mirror://gentoo/texlive-module-cases.doc-2016.tar.xz mirror://gentoo/texlive-module-casyl.doc-2016.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.doc-2016.tar.xz mirror://gentoo/texlive-module-catechis.doc-2016.tar.xz mirror://gentoo/texlive-module-catoptions.doc-2016.tar.xz mirror://gentoo/texlive-module-cbcoptic.doc-2016.tar.xz mirror://gentoo/texlive-module-ccaption.doc-2016.tar.xz mirror://gentoo/texlive-module-cclicenses.doc-2016.tar.xz mirror://gentoo/texlive-module-cd.doc-2016.tar.xz mirror://gentoo/texlive-module-cd-cover.doc-2016.tar.xz mirror://gentoo/texlive-module-cdpbundl.doc-2016.tar.xz mirror://gentoo/texlive-module-cellspace.doc-2016.tar.xz mirror://gentoo/texlive-module-censor.doc-2016.tar.xz mirror://gentoo/texlive-module-changebar.doc-2016.tar.xz mirror://gentoo/texlive-module-changelayout.doc-2016.tar.xz mirror://gentoo/texlive-module-changepage.doc-2016.tar.xz mirror://gentoo/texlive-module-changes.doc-2016.tar.xz mirror://gentoo/texlive-module-chappg.doc-2016.tar.xz mirror://gentoo/texlive-module-chapterfolder.doc-2016.tar.xz mirror://gentoo/texlive-module-chet.doc-2016.tar.xz mirror://gentoo/texlive-module-chextras.doc-2016.tar.xz mirror://gentoo/texlive-module-chkfloat.doc-2016.tar.xz mirror://gentoo/texlive-module-chletter.doc-2016.tar.xz mirror://gentoo/texlive-module-chngcntr.doc-2016.tar.xz mirror://gentoo/texlive-module-chronology.doc-2016.tar.xz mirror://gentoo/texlive-module-circ.doc-2016.tar.xz mirror://gentoo/texlive-module-classics.doc-2016.tar.xz mirror://gentoo/texlive-module-clefval.doc-2016.tar.xz mirror://gentoo/texlive-module-cleveref.doc-2016.tar.xz mirror://gentoo/texlive-module-clipboard.doc-2016.tar.xz mirror://gentoo/texlive-module-clock.doc-2016.tar.xz mirror://gentoo/texlive-module-cmdstring.doc-2016.tar.xz mirror://gentoo/texlive-module-cmdtrack.doc-2016.tar.xz mirror://gentoo/texlive-module-cmsd.doc-2016.tar.xz mirror://gentoo/texlive-module-cnltx.doc-2016.tar.xz mirror://gentoo/texlive-module-cntformats.doc-2016.tar.xz mirror://gentoo/texlive-module-cntperchap.doc-2016.tar.xz mirror://gentoo/texlive-module-codedoc.doc-2016.tar.xz mirror://gentoo/texlive-module-codepage.doc-2016.tar.xz mirror://gentoo/texlive-module-codesection.doc-2016.tar.xz mirror://gentoo/texlive-module-collcell.doc-2016.tar.xz mirror://gentoo/texlive-module-collectbox.doc-2016.tar.xz mirror://gentoo/texlive-module-colordoc.doc-2016.tar.xz mirror://gentoo/texlive-module-colorinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-coloring.doc-2016.tar.xz mirror://gentoo/texlive-module-colorspace.doc-2016.tar.xz mirror://gentoo/texlive-module-colortab.doc-2016.tar.xz mirror://gentoo/texlive-module-colorwav.doc-2016.tar.xz mirror://gentoo/texlive-module-colorweb.doc-2016.tar.xz mirror://gentoo/texlive-module-colourchange.doc-2016.tar.xz mirror://gentoo/texlive-module-combelow.doc-2016.tar.xz mirror://gentoo/texlive-module-combine.doc-2016.tar.xz mirror://gentoo/texlive-module-comma.doc-2016.tar.xz mirror://gentoo/texlive-module-commado.doc-2016.tar.xz mirror://gentoo/texlive-module-comment.doc-2016.tar.xz mirror://gentoo/texlive-module-concepts.doc-2016.tar.xz mirror://gentoo/texlive-module-concprog.doc-2016.tar.xz mirror://gentoo/texlive-module-constants.doc-2016.tar.xz mirror://gentoo/texlive-module-continue.doc-2016.tar.xz mirror://gentoo/texlive-module-contour.doc-2016.tar.xz mirror://gentoo/texlive-module-contracard.doc-2016.tar.xz mirror://gentoo/texlive-module-conv-xkv.doc-2016.tar.xz mirror://gentoo/texlive-module-cooking.doc-2016.tar.xz mirror://gentoo/texlive-module-cooking-units.doc-2016.tar.xz mirror://gentoo/texlive-module-cool.doc-2016.tar.xz mirror://gentoo/texlive-module-coollist.doc-2016.tar.xz mirror://gentoo/texlive-module-coolstr.doc-2016.tar.xz mirror://gentoo/texlive-module-coolthms.doc-2016.tar.xz mirror://gentoo/texlive-module-cooltooltips.doc-2016.tar.xz mirror://gentoo/texlive-module-coordsys.doc-2016.tar.xz mirror://gentoo/texlive-module-copyedit.doc-2016.tar.xz mirror://gentoo/texlive-module-copyrightbox.doc-2016.tar.xz mirror://gentoo/texlive-module-coseoul.doc-2016.tar.xz mirror://gentoo/texlive-module-counttexruns.doc-2016.tar.xz mirror://gentoo/texlive-module-courseoutline.doc-2016.tar.xz mirror://gentoo/texlive-module-coursepaper.doc-2016.tar.xz mirror://gentoo/texlive-module-coverpage.doc-2016.tar.xz mirror://gentoo/texlive-module-cprotect.doc-2016.tar.xz mirror://gentoo/texlive-module-crbox.doc-2016.tar.xz mirror://gentoo/texlive-module-crossreference.doc-2016.tar.xz mirror://gentoo/texlive-module-csquotes.doc-2016.tar.xz mirror://gentoo/texlive-module-css-colors.doc-2016.tar.xz mirror://gentoo/texlive-module-csvsimple.doc-2016.tar.xz mirror://gentoo/texlive-module-cuisine.doc-2016.tar.xz mirror://gentoo/texlive-module-currfile.doc-2016.tar.xz mirror://gentoo/texlive-module-cutwin.doc-2016.tar.xz mirror://gentoo/texlive-module-cv.doc-2016.tar.xz mirror://gentoo/texlive-module-cv4tw.doc-2016.tar.xz mirror://gentoo/texlive-module-cweb-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-cyber.doc-2016.tar.xz mirror://gentoo/texlive-module-cybercic.doc-2016.tar.xz mirror://gentoo/texlive-module-dashbox.doc-2016.tar.xz mirror://gentoo/texlive-module-dashrule.doc-2016.tar.xz mirror://gentoo/texlive-module-dashundergaps.doc-2016.tar.xz mirror://gentoo/texlive-module-dataref.doc-2016.tar.xz mirror://gentoo/texlive-module-datatool.doc-2016.tar.xz mirror://gentoo/texlive-module-dateiliste.doc-2016.tar.xz mirror://gentoo/texlive-module-datenumber.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-basque.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-breton.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-czech.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-danish.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-english.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-french.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-galician.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-german.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-greek.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-irish.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-italian.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-latin.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-polish.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-russian.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-samin.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.doc-2016.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.doc-2016.tar.xz mirror://gentoo/texlive-module-dblfloatfix.doc-2016.tar.xz mirror://gentoo/texlive-module-decimal.doc-2016.tar.xz mirror://gentoo/texlive-module-decorule.doc-2016.tar.xz mirror://gentoo/texlive-module-delimtxt.doc-2016.tar.xz mirror://gentoo/texlive-module-denisbdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-diagbox.doc-2016.tar.xz mirror://gentoo/texlive-module-diagnose.doc-2016.tar.xz mirror://gentoo/texlive-module-dialogl.doc-2016.tar.xz mirror://gentoo/texlive-module-dichokey.doc-2016.tar.xz mirror://gentoo/texlive-module-dinbrief.doc-2016.tar.xz mirror://gentoo/texlive-module-directory.doc-2016.tar.xz mirror://gentoo/texlive-module-dirtytalk.doc-2016.tar.xz mirror://gentoo/texlive-module-dlfltxb.doc-2016.tar.xz mirror://gentoo/texlive-module-dnaseq.doc-2016.tar.xz mirror://gentoo/texlive-module-doclicense.doc-2016.tar.xz mirror://gentoo/texlive-module-docmfp.doc-2016.tar.xz mirror://gentoo/texlive-module-docmute.doc-2016.tar.xz mirror://gentoo/texlive-module-doctools.doc-2016.tar.xz mirror://gentoo/texlive-module-documentation.doc-2016.tar.xz mirror://gentoo/texlive-module-doi.doc-2016.tar.xz mirror://gentoo/texlive-module-dotarrow.doc-2016.tar.xz mirror://gentoo/texlive-module-dotseqn.doc-2016.tar.xz mirror://gentoo/texlive-module-download.doc-2016.tar.xz mirror://gentoo/texlive-module-dox.doc-2016.tar.xz mirror://gentoo/texlive-module-dpfloat.doc-2016.tar.xz mirror://gentoo/texlive-module-dprogress.doc-2016.tar.xz mirror://gentoo/texlive-module-drac.doc-2016.tar.xz mirror://gentoo/texlive-module-draftcopy.doc-2016.tar.xz mirror://gentoo/texlive-module-draftwatermark.doc-2016.tar.xz mirror://gentoo/texlive-module-dtk.doc-2016.tar.xz mirror://gentoo/texlive-module-dtxdescribe.doc-2016.tar.xz mirror://gentoo/texlive-module-dtxgallery.doc-2016.tar.xz mirror://gentoo/texlive-module-dvdcoll.doc-2016.tar.xz mirror://gentoo/texlive-module-dynamicnumber.doc-2016.tar.xz mirror://gentoo/texlive-module-dynblocks.doc-2016.tar.xz mirror://gentoo/texlive-module-ean13isbn.doc-2016.tar.xz mirror://gentoo/texlive-module-easy.doc-2016.tar.xz mirror://gentoo/texlive-module-easy-todo.doc-2016.tar.xz mirror://gentoo/texlive-module-easyfig.doc-2016.tar.xz mirror://gentoo/texlive-module-easylist.doc-2016.tar.xz mirror://gentoo/texlive-module-easyreview.doc-2016.tar.xz mirror://gentoo/texlive-module-ebezier.doc-2016.tar.xz mirror://gentoo/texlive-module-ecclesiastic.doc-2016.tar.xz mirror://gentoo/texlive-module-ecv.doc-2016.tar.xz mirror://gentoo/texlive-module-ed.doc-2016.tar.xz mirror://gentoo/texlive-module-edmargin.doc-2016.tar.xz mirror://gentoo/texlive-module-eemeir.doc-2016.tar.xz mirror://gentoo/texlive-module-efbox.doc-2016.tar.xz mirror://gentoo/texlive-module-egplot.doc-2016.tar.xz mirror://gentoo/texlive-module-elements.doc-2016.tar.xz mirror://gentoo/texlive-module-ellipsis.doc-2016.tar.xz mirror://gentoo/texlive-module-elmath.doc-2016.tar.xz mirror://gentoo/texlive-module-elocalloc.doc-2016.tar.xz mirror://gentoo/texlive-module-elpres.doc-2016.tar.xz mirror://gentoo/texlive-module-elzcards.doc-2016.tar.xz mirror://gentoo/texlive-module-emarks.doc-2016.tar.xz mirror://gentoo/texlive-module-embedall.doc-2016.tar.xz mirror://gentoo/texlive-module-embrac.doc-2016.tar.xz mirror://gentoo/texlive-module-emptypage.doc-2016.tar.xz mirror://gentoo/texlive-module-emulateapj.doc-2016.tar.xz mirror://gentoo/texlive-module-endfloat.doc-2016.tar.xz mirror://gentoo/texlive-module-endheads.doc-2016.tar.xz mirror://gentoo/texlive-module-endnotes.doc-2016.tar.xz mirror://gentoo/texlive-module-engpron.doc-2016.tar.xz mirror://gentoo/texlive-module-engrec.doc-2016.tar.xz mirror://gentoo/texlive-module-enotez.doc-2016.tar.xz mirror://gentoo/texlive-module-enumitem.doc-2016.tar.xz mirror://gentoo/texlive-module-enumitem-zref.doc-2016.tar.xz mirror://gentoo/texlive-module-envbig.doc-2016.tar.xz mirror://gentoo/texlive-module-environ.doc-2016.tar.xz mirror://gentoo/texlive-module-epigraph.doc-2016.tar.xz mirror://gentoo/texlive-module-epiolmec.doc-2016.tar.xz mirror://gentoo/texlive-module-eqell.doc-2016.tar.xz mirror://gentoo/texlive-module-eqlist.doc-2016.tar.xz mirror://gentoo/texlive-module-eqparbox.doc-2016.tar.xz mirror://gentoo/texlive-module-errata.doc-2016.tar.xz mirror://gentoo/texlive-module-esami.doc-2016.tar.xz mirror://gentoo/texlive-module-esdiff.doc-2016.tar.xz mirror://gentoo/texlive-module-esint.doc-2016.tar.xz mirror://gentoo/texlive-module-esint-type1.doc-2016.tar.xz mirror://gentoo/texlive-module-etaremune.doc-2016.tar.xz mirror://gentoo/texlive-module-etextools.doc-2016.tar.xz mirror://gentoo/texlive-module-etoc.doc-2016.tar.xz mirror://gentoo/texlive-module-etoolbox.doc-2016.tar.xz mirror://gentoo/texlive-module-eukdate.doc-2016.tar.xz mirror://gentoo/texlive-module-eulerpx.doc-2016.tar.xz mirror://gentoo/texlive-module-europasscv.doc-2016.tar.xz mirror://gentoo/texlive-module-everyhook.doc-2016.tar.xz mirror://gentoo/texlive-module-everypage.doc-2016.tar.xz mirror://gentoo/texlive-module-exam.doc-2016.tar.xz mirror://gentoo/texlive-module-exam-n.doc-2016.tar.xz mirror://gentoo/texlive-module-examdesign.doc-2016.tar.xz mirror://gentoo/texlive-module-examplep.doc-2016.tar.xz mirror://gentoo/texlive-module-exceltex.doc-2016.tar.xz mirror://gentoo/texlive-module-excludeonly.doc-2016.tar.xz mirror://gentoo/texlive-module-exercise.doc-2016.tar.xz mirror://gentoo/texlive-module-exercises.doc-2016.tar.xz mirror://gentoo/texlive-module-exp-testopt.doc-2016.tar.xz mirror://gentoo/texlive-module-expdlist.doc-2016.tar.xz mirror://gentoo/texlive-module-export.doc-2016.tar.xz mirror://gentoo/texlive-module-exsheets.doc-2016.tar.xz mirror://gentoo/texlive-module-exsol.doc-2016.tar.xz mirror://gentoo/texlive-module-extract.doc-2016.tar.xz mirror://gentoo/texlive-module-facsimile.doc-2016.tar.xz mirror://gentoo/texlive-module-factura.doc-2016.tar.xz mirror://gentoo/texlive-module-fancylabel.doc-2016.tar.xz mirror://gentoo/texlive-module-fancynum.doc-2016.tar.xz mirror://gentoo/texlive-module-fancypar.doc-2016.tar.xz mirror://gentoo/texlive-module-fancyslides.doc-2016.tar.xz mirror://gentoo/texlive-module-fancytabs.doc-2016.tar.xz mirror://gentoo/texlive-module-fancytooltips.doc-2016.tar.xz mirror://gentoo/texlive-module-fcolumn.doc-2016.tar.xz mirror://gentoo/texlive-module-ffslides.doc-2016.tar.xz mirror://gentoo/texlive-module-fgruler.doc-2016.tar.xz mirror://gentoo/texlive-module-fibeamer.doc-2016.tar.xz mirror://gentoo/texlive-module-fifo-stack.doc-2016.tar.xz mirror://gentoo/texlive-module-figsize.doc-2016.tar.xz mirror://gentoo/texlive-module-filecontents.doc-2016.tar.xz mirror://gentoo/texlive-module-filecontentsdef.doc-2016.tar.xz mirror://gentoo/texlive-module-filedate.doc-2016.tar.xz mirror://gentoo/texlive-module-filehook.doc-2016.tar.xz mirror://gentoo/texlive-module-fileinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-filemod.doc-2016.tar.xz mirror://gentoo/texlive-module-fink.doc-2016.tar.xz mirror://gentoo/texlive-module-finstrut.doc-2016.tar.xz mirror://gentoo/texlive-module-fithesis.doc-2016.tar.xz mirror://gentoo/texlive-module-fixcmex.doc-2016.tar.xz mirror://gentoo/texlive-module-fixfoot.doc-2016.tar.xz mirror://gentoo/texlive-module-fixme.doc-2016.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.doc-2016.tar.xz mirror://gentoo/texlive-module-fjodor.doc-2016.tar.xz mirror://gentoo/texlive-module-flabels.doc-2016.tar.xz mirror://gentoo/texlive-module-flacards.doc-2016.tar.xz mirror://gentoo/texlive-module-flagderiv.doc-2016.tar.xz mirror://gentoo/texlive-module-flashcards.doc-2016.tar.xz mirror://gentoo/texlive-module-flashmovie.doc-2016.tar.xz mirror://gentoo/texlive-module-flipbook.doc-2016.tar.xz mirror://gentoo/texlive-module-flippdf.doc-2016.tar.xz mirror://gentoo/texlive-module-floatflt.doc-2016.tar.xz mirror://gentoo/texlive-module-floatrow.doc-2016.tar.xz mirror://gentoo/texlive-module-flowfram.doc-2016.tar.xz mirror://gentoo/texlive-module-fmp.doc-2016.tar.xz mirror://gentoo/texlive-module-fmtcount.doc-2016.tar.xz mirror://gentoo/texlive-module-fn2end.doc-2016.tar.xz mirror://gentoo/texlive-module-fnbreak.doc-2016.tar.xz mirror://gentoo/texlive-module-fncychap.doc-2016.tar.xz mirror://gentoo/texlive-module-fncylab.doc-2016.tar.xz mirror://gentoo/texlive-module-fnpara.doc-2016.tar.xz mirror://gentoo/texlive-module-fnpct.doc-2016.tar.xz mirror://gentoo/texlive-module-fnumprint.doc-2016.tar.xz mirror://gentoo/texlive-module-foilhtml.doc-2016.tar.xz mirror://gentoo/texlive-module-fontaxes.doc-2016.tar.xz mirror://gentoo/texlive-module-fonttable.doc-2016.tar.xz mirror://gentoo/texlive-module-footmisc.doc-2016.tar.xz mirror://gentoo/texlive-module-footmisx.doc-2016.tar.xz mirror://gentoo/texlive-module-footnotebackref.doc-2016.tar.xz mirror://gentoo/texlive-module-footnotehyper.doc-2016.tar.xz mirror://gentoo/texlive-module-footnoterange.doc-2016.tar.xz mirror://gentoo/texlive-module-footnpag.doc-2016.tar.xz mirror://gentoo/texlive-module-forarray.doc-2016.tar.xz mirror://gentoo/texlive-module-foreign.doc-2016.tar.xz mirror://gentoo/texlive-module-forloop.doc-2016.tar.xz mirror://gentoo/texlive-module-formlett.doc-2016.tar.xz mirror://gentoo/texlive-module-formular.doc-2016.tar.xz mirror://gentoo/texlive-module-fragments.doc-2016.tar.xz mirror://gentoo/texlive-module-frame.doc-2016.tar.xz mirror://gentoo/texlive-module-framed.doc-2016.tar.xz mirror://gentoo/texlive-module-frankenstein.doc-2016.tar.xz mirror://gentoo/texlive-module-frege.doc-2016.tar.xz mirror://gentoo/texlive-module-ftcap.doc-2016.tar.xz mirror://gentoo/texlive-module-ftnxtra.doc-2016.tar.xz mirror://gentoo/texlive-module-fullblck.doc-2016.tar.xz mirror://gentoo/texlive-module-fullminipage.doc-2016.tar.xz mirror://gentoo/texlive-module-fullwidth.doc-2016.tar.xz mirror://gentoo/texlive-module-fundus-calligra.doc-2016.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.doc-2016.tar.xz mirror://gentoo/texlive-module-fvextra.doc-2016.tar.xz mirror://gentoo/texlive-module-fwlw.doc-2016.tar.xz mirror://gentoo/texlive-module-gauss.doc-2016.tar.xz mirror://gentoo/texlive-module-gcard.doc-2016.tar.xz mirror://gentoo/texlive-module-gcite.doc-2016.tar.xz mirror://gentoo/texlive-module-gender.doc-2016.tar.xz mirror://gentoo/texlive-module-genmpage.doc-2016.tar.xz mirror://gentoo/texlive-module-getfiledate.doc-2016.tar.xz mirror://gentoo/texlive-module-getitems.doc-2016.tar.xz mirror://gentoo/texlive-module-ginpenc.doc-2016.tar.xz mirror://gentoo/texlive-module-gitfile-info.doc-2016.tar.xz mirror://gentoo/texlive-module-gitinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-gitinfo2.doc-2016.tar.xz mirror://gentoo/texlive-module-gitlog.doc-2016.tar.xz mirror://gentoo/texlive-module-gloss.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-danish.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-english.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-extra.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-french.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-german.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-irish.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-italian.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-polish.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.doc-2016.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.doc-2016.tar.xz mirror://gentoo/texlive-module-gmdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.doc-2016.tar.xz mirror://gentoo/texlive-module-gmiflink.doc-2016.tar.xz mirror://gentoo/texlive-module-gmutils.doc-2016.tar.xz mirror://gentoo/texlive-module-gmverb.doc-2016.tar.xz mirror://gentoo/texlive-module-graphbox.doc-2016.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.doc-2016.tar.xz mirror://gentoo/texlive-module-graphicxbox.doc-2016.tar.xz mirror://gentoo/texlive-module-grfpaste.doc-2016.tar.xz mirror://gentoo/texlive-module-grid.doc-2016.tar.xz mirror://gentoo/texlive-module-grid-system.doc-2016.tar.xz mirror://gentoo/texlive-module-gridset.doc-2016.tar.xz mirror://gentoo/texlive-module-guitlogo.doc-2016.tar.xz mirror://gentoo/texlive-module-halloweenmath.doc-2016.tar.xz mirror://gentoo/texlive-module-handout.doc-2016.tar.xz mirror://gentoo/texlive-module-hang.doc-2016.tar.xz mirror://gentoo/texlive-module-hanging.doc-2016.tar.xz mirror://gentoo/texlive-module-hardwrap.doc-2016.tar.xz mirror://gentoo/texlive-module-harnon-cv.doc-2016.tar.xz mirror://gentoo/texlive-module-harpoon.doc-2016.tar.xz mirror://gentoo/texlive-module-hc.doc-2016.tar.xz mirror://gentoo/texlive-module-he-she.doc-2016.tar.xz mirror://gentoo/texlive-module-hhtensor.doc-2016.tar.xz mirror://gentoo/texlive-module-histogr.doc-2016.tar.xz mirror://gentoo/texlive-module-hitec.doc-2016.tar.xz mirror://gentoo/texlive-module-hletter.doc-2016.tar.xz mirror://gentoo/texlive-module-hpsdiss.doc-2016.tar.xz mirror://gentoo/texlive-module-hrefhide.doc-2016.tar.xz mirror://gentoo/texlive-module-hvindex.doc-2016.tar.xz mirror://gentoo/texlive-module-hypdvips.doc-2016.tar.xz mirror://gentoo/texlive-module-hyper.doc-2016.tar.xz mirror://gentoo/texlive-module-hypernat.doc-2016.tar.xz mirror://gentoo/texlive-module-hyperref-docsrc.doc-2016.tar.xz mirror://gentoo/texlive-module-hyperxmp.doc-2016.tar.xz mirror://gentoo/texlive-module-hyphenat.doc-2016.tar.xz mirror://gentoo/texlive-module-idxcmds.doc-2016.tar.xz mirror://gentoo/texlive-module-idxlayout.doc-2016.tar.xz mirror://gentoo/texlive-module-iffont.doc-2016.tar.xz mirror://gentoo/texlive-module-ifmslide.doc-2016.tar.xz mirror://gentoo/texlive-module-ifmtarg.doc-2016.tar.xz mirror://gentoo/texlive-module-ifnextok.doc-2016.tar.xz mirror://gentoo/texlive-module-ifoddpage.doc-2016.tar.xz mirror://gentoo/texlive-module-ifplatform.doc-2016.tar.xz mirror://gentoo/texlive-module-ifthenx.doc-2016.tar.xz mirror://gentoo/texlive-module-iitem.doc-2016.tar.xz mirror://gentoo/texlive-module-image-gallery.doc-2016.tar.xz mirror://gentoo/texlive-module-imakeidx.doc-2016.tar.xz mirror://gentoo/texlive-module-import.doc-2016.tar.xz mirror://gentoo/texlive-module-incgraph.doc-2016.tar.xz mirror://gentoo/texlive-module-indextools.doc-2016.tar.xz mirror://gentoo/texlive-module-inlinedef.doc-2016.tar.xz mirror://gentoo/texlive-module-inputtrc.doc-2016.tar.xz mirror://gentoo/texlive-module-interactiveworkbook.doc-2016.tar.xz mirror://gentoo/texlive-module-interfaces.doc-2016.tar.xz mirror://gentoo/texlive-module-inversepath.doc-2016.tar.xz mirror://gentoo/texlive-module-invoice.doc-2016.tar.xz mirror://gentoo/texlive-module-iso.doc-2016.tar.xz mirror://gentoo/texlive-module-iso10303.doc-2016.tar.xz mirror://gentoo/texlive-module-isodate.doc-2016.tar.xz mirror://gentoo/texlive-module-isodoc.doc-2016.tar.xz mirror://gentoo/texlive-module-isonums.doc-2016.tar.xz mirror://gentoo/texlive-module-isorot.doc-2016.tar.xz mirror://gentoo/texlive-module-isotope.doc-2016.tar.xz mirror://gentoo/texlive-module-issuulinks.doc-2016.tar.xz mirror://gentoo/texlive-module-iwhdp.doc-2016.tar.xz mirror://gentoo/texlive-module-jlabels.doc-2016.tar.xz mirror://gentoo/texlive-module-jslectureplanner.doc-2016.tar.xz mirror://gentoo/texlive-module-jumplines.doc-2016.tar.xz mirror://gentoo/texlive-module-jvlisting.doc-2016.tar.xz mirror://gentoo/texlive-module-kantlipsum.doc-2016.tar.xz mirror://gentoo/texlive-module-kerntest.doc-2016.tar.xz mirror://gentoo/texlive-module-keycommand.doc-2016.tar.xz mirror://gentoo/texlive-module-keyfloat.doc-2016.tar.xz mirror://gentoo/texlive-module-keyreader.doc-2016.tar.xz mirror://gentoo/texlive-module-keystroke.doc-2016.tar.xz mirror://gentoo/texlive-module-keyval2e.doc-2016.tar.xz mirror://gentoo/texlive-module-keyvaltable.doc-2016.tar.xz mirror://gentoo/texlive-module-kix.doc-2016.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic.doc-2016.tar.xz mirror://gentoo/texlive-module-koma-script-sfs.doc-2016.tar.xz mirror://gentoo/texlive-module-komacv.doc-2016.tar.xz mirror://gentoo/texlive-module-ktv-texdata.doc-2016.tar.xz mirror://gentoo/texlive-module-l3build.doc-2016.tar.xz mirror://gentoo/texlive-module-labbook.doc-2016.tar.xz mirror://gentoo/texlive-module-labels.doc-2016.tar.xz mirror://gentoo/texlive-module-lastpackage.doc-2016.tar.xz mirror://gentoo/texlive-module-lastpage.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-tds.doc-2016.tar.xz mirror://gentoo/texlive-module-latexdemo.doc-2016.tar.xz mirror://gentoo/texlive-module-latexgit.doc-2016.tar.xz mirror://gentoo/texlive-module-layouts.doc-2016.tar.xz mirror://gentoo/texlive-module-lazylist.doc-2016.tar.xz mirror://gentoo/texlive-module-lcd.doc-2016.tar.xz mirror://gentoo/texlive-module-lcg.doc-2016.tar.xz mirror://gentoo/texlive-module-leading.doc-2016.tar.xz mirror://gentoo/texlive-module-leftidx.doc-2016.tar.xz mirror://gentoo/texlive-module-lengthconvert.doc-2016.tar.xz mirror://gentoo/texlive-module-lettre.doc-2016.tar.xz mirror://gentoo/texlive-module-lettrine.doc-2016.tar.xz mirror://gentoo/texlive-module-lewis.doc-2016.tar.xz mirror://gentoo/texlive-module-lhelp.doc-2016.tar.xz mirror://gentoo/texlive-module-libgreek.doc-2016.tar.xz mirror://gentoo/texlive-module-limap.doc-2016.tar.xz mirror://gentoo/texlive-module-linegoal.doc-2016.tar.xz mirror://gentoo/texlive-module-linop.doc-2016.tar.xz mirror://gentoo/texlive-module-lipsum.doc-2016.tar.xz mirror://gentoo/texlive-module-lisp-on-tex.doc-2016.tar.xz mirror://gentoo/texlive-module-listing.doc-2016.tar.xz mirror://gentoo/texlive-module-listlbls.doc-2016.tar.xz mirror://gentoo/texlive-module-listliketab.doc-2016.tar.xz mirror://gentoo/texlive-module-listofsymbols.doc-2016.tar.xz mirror://gentoo/texlive-module-lkproof.doc-2016.tar.xz mirror://gentoo/texlive-module-lmake.doc-2016.tar.xz mirror://gentoo/texlive-module-locality.doc-2016.tar.xz mirror://gentoo/texlive-module-localloc.doc-2016.tar.xz mirror://gentoo/texlive-module-logbox.doc-2016.tar.xz mirror://gentoo/texlive-module-logical-markup-utils.doc-2016.tar.xz mirror://gentoo/texlive-module-logpap.doc-2016.tar.xz mirror://gentoo/texlive-module-longfbox.doc-2016.tar.xz mirror://gentoo/texlive-module-longfigure.doc-2016.tar.xz mirror://gentoo/texlive-module-longnamefilelist.doc-2016.tar.xz mirror://gentoo/texlive-module-loops.doc-2016.tar.xz mirror://gentoo/texlive-module-lsc.doc-2016.tar.xz mirror://gentoo/texlive-module-lstaddons.doc-2016.tar.xz mirror://gentoo/texlive-module-lt3graph.doc-2016.tar.xz mirror://gentoo/texlive-module-ltablex.doc-2016.tar.xz mirror://gentoo/texlive-module-ltabptch.doc-2016.tar.xz mirror://gentoo/texlive-module-ltxdockit.doc-2016.tar.xz mirror://gentoo/texlive-module-ltxindex.doc-2016.tar.xz mirror://gentoo/texlive-module-ltxkeys.doc-2016.tar.xz mirror://gentoo/texlive-module-ltxnew.doc-2016.tar.xz mirror://gentoo/texlive-module-ltxtools.doc-2016.tar.xz mirror://gentoo/texlive-module-macroswap.doc-2016.tar.xz mirror://gentoo/texlive-module-magaz.doc-2016.tar.xz mirror://gentoo/texlive-module-mailing.doc-2016.tar.xz mirror://gentoo/texlive-module-mailmerge.doc-2016.tar.xz mirror://gentoo/texlive-module-makebarcode.doc-2016.tar.xz mirror://gentoo/texlive-module-makebase.doc-2016.tar.xz mirror://gentoo/texlive-module-makebox.doc-2016.tar.xz mirror://gentoo/texlive-module-makecell.doc-2016.tar.xz mirror://gentoo/texlive-module-makecirc.doc-2016.tar.xz mirror://gentoo/texlive-module-makecmds.doc-2016.tar.xz mirror://gentoo/texlive-module-makedtx.doc-2016.tar.xz mirror://gentoo/texlive-module-makeglos.doc-2016.tar.xz mirror://gentoo/texlive-module-mandi.doc-2016.tar.xz mirror://gentoo/texlive-module-manuscript.doc-2016.tar.xz mirror://gentoo/texlive-module-marginfix.doc-2016.tar.xz mirror://gentoo/texlive-module-marginnote.doc-2016.tar.xz mirror://gentoo/texlive-module-markdown.doc-2016.tar.xz mirror://gentoo/texlive-module-mathalfa.doc-2016.tar.xz mirror://gentoo/texlive-module-mathastext.doc-2016.tar.xz mirror://gentoo/texlive-module-mathexam.doc-2016.tar.xz mirror://gentoo/texlive-module-maybemath.doc-2016.tar.xz mirror://gentoo/texlive-module-mbenotes.doc-2016.tar.xz mirror://gentoo/texlive-module-mcaption.doc-2016.tar.xz mirror://gentoo/texlive-module-mceinleger.doc-2016.tar.xz mirror://gentoo/texlive-module-mcite.doc-2016.tar.xz mirror://gentoo/texlive-module-mciteplus.doc-2016.tar.xz mirror://gentoo/texlive-module-mdframed.doc-2016.tar.xz mirror://gentoo/texlive-module-media9.doc-2016.tar.xz mirror://gentoo/texlive-module-medstarbeamer.doc-2016.tar.xz mirror://gentoo/texlive-module-meetingmins.doc-2016.tar.xz mirror://gentoo/texlive-module-memexsupp.doc-2016.tar.xz mirror://gentoo/texlive-module-memory.doc-2016.tar.xz mirror://gentoo/texlive-module-menu.doc-2016.tar.xz mirror://gentoo/texlive-module-menukeys.doc-2016.tar.xz mirror://gentoo/texlive-module-method.doc-2016.tar.xz mirror://gentoo/texlive-module-metre.doc-2016.tar.xz mirror://gentoo/texlive-module-mfirstuc.doc-2016.tar.xz mirror://gentoo/texlive-module-mftinc.doc-2016.tar.xz mirror://gentoo/texlive-module-midpage.doc-2016.tar.xz mirror://gentoo/texlive-module-minibox.doc-2016.tar.xz mirror://gentoo/texlive-module-minifp.doc-2016.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.doc-2016.tar.xz mirror://gentoo/texlive-module-minitoc.doc-2016.tar.xz mirror://gentoo/texlive-module-minorrevision.doc-2016.tar.xz mirror://gentoo/texlive-module-minted.doc-2016.tar.xz mirror://gentoo/texlive-module-minutes.doc-2016.tar.xz mirror://gentoo/texlive-module-mla-paper.doc-2016.tar.xz mirror://gentoo/texlive-module-mlist.doc-2016.tar.xz mirror://gentoo/texlive-module-mmap.doc-2016.tar.xz mirror://gentoo/texlive-module-mnotes.doc-2016.tar.xz mirror://gentoo/texlive-module-moderncv.doc-2016.tar.xz mirror://gentoo/texlive-module-moderntimeline.doc-2016.tar.xz mirror://gentoo/texlive-module-modref.doc-2016.tar.xz mirror://gentoo/texlive-module-modroman.doc-2016.tar.xz mirror://gentoo/texlive-module-monofill.doc-2016.tar.xz mirror://gentoo/texlive-module-moodle.doc-2016.tar.xz mirror://gentoo/texlive-module-moreenum.doc-2016.tar.xz mirror://gentoo/texlive-module-morefloats.doc-2016.tar.xz mirror://gentoo/texlive-module-morehype.doc-2016.tar.xz mirror://gentoo/texlive-module-moresize.doc-2016.tar.xz mirror://gentoo/texlive-module-moreverb.doc-2016.tar.xz mirror://gentoo/texlive-module-morewrites.doc-2016.tar.xz mirror://gentoo/texlive-module-movie15.doc-2016.tar.xz mirror://gentoo/texlive-module-mparhack.doc-2016.tar.xz mirror://gentoo/texlive-module-mpostinl.doc-2016.tar.xz mirror://gentoo/texlive-module-msc.doc-2016.tar.xz mirror://gentoo/texlive-module-msg.doc-2016.tar.xz mirror://gentoo/texlive-module-mslapa.doc-2016.tar.xz mirror://gentoo/texlive-module-mtgreek.doc-2016.tar.xz mirror://gentoo/texlive-module-multenum.doc-2016.tar.xz mirror://gentoo/texlive-module-multiaudience.doc-2016.tar.xz mirror://gentoo/texlive-module-multibbl.doc-2016.tar.xz mirror://gentoo/texlive-module-multicap.doc-2016.tar.xz mirror://gentoo/texlive-module-multidef.doc-2016.tar.xz mirror://gentoo/texlive-module-multienv.doc-2016.tar.xz mirror://gentoo/texlive-module-multiexpand.doc-2016.tar.xz mirror://gentoo/texlive-module-multirow.doc-2016.tar.xz mirror://gentoo/texlive-module-mversion.doc-2016.tar.xz mirror://gentoo/texlive-module-mwe.doc-2016.tar.xz mirror://gentoo/texlive-module-mycv.doc-2016.tar.xz mirror://gentoo/texlive-module-mylatexformat.doc-2016.tar.xz mirror://gentoo/texlive-module-nag.doc-2016.tar.xz mirror://gentoo/texlive-module-nameauth.doc-2016.tar.xz mirror://gentoo/texlive-module-namespc.doc-2016.tar.xz mirror://gentoo/texlive-module-ncclatex.doc-2016.tar.xz mirror://gentoo/texlive-module-ncctools.doc-2016.tar.xz mirror://gentoo/texlive-module-needspace.doc-2016.tar.xz mirror://gentoo/texlive-module-newcommand.doc-2016.tar.xz mirror://gentoo/texlive-module-newenviron.doc-2016.tar.xz mirror://gentoo/texlive-module-newfile.doc-2016.tar.xz mirror://gentoo/texlive-module-newlfm.doc-2016.tar.xz mirror://gentoo/texlive-module-newspaper.doc-2016.tar.xz mirror://gentoo/texlive-module-newunicodechar.doc-2016.tar.xz mirror://gentoo/texlive-module-newvbtm.doc-2016.tar.xz mirror://gentoo/texlive-module-newverbs.doc-2016.tar.xz mirror://gentoo/texlive-module-nfssext-cfr.doc-2016.tar.xz mirror://gentoo/texlive-module-nicefilelist.doc-2016.tar.xz mirror://gentoo/texlive-module-niceframe.doc-2016.tar.xz mirror://gentoo/texlive-module-nicetext.doc-2016.tar.xz mirror://gentoo/texlive-module-nlctdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-noconflict.doc-2016.tar.xz mirror://gentoo/texlive-module-noindentafter.doc-2016.tar.xz mirror://gentoo/texlive-module-noitcrul.doc-2016.tar.xz mirror://gentoo/texlive-module-nolbreaks.doc-2016.tar.xz mirror://gentoo/texlive-module-nomencl.doc-2016.tar.xz mirror://gentoo/texlive-module-nomentbl.doc-2016.tar.xz mirror://gentoo/texlive-module-nonfloat.doc-2016.tar.xz mirror://gentoo/texlive-module-nonumonpart.doc-2016.tar.xz mirror://gentoo/texlive-module-nopageno.doc-2016.tar.xz mirror://gentoo/texlive-module-normalcolor.doc-2016.tar.xz mirror://gentoo/texlive-module-notes.doc-2016.tar.xz mirror://gentoo/texlive-module-notespages.doc-2016.tar.xz mirror://gentoo/texlive-module-notoccite.doc-2016.tar.xz mirror://gentoo/texlive-module-nowidow.doc-2016.tar.xz mirror://gentoo/texlive-module-nox.doc-2016.tar.xz mirror://gentoo/texlive-module-ntheorem.doc-2016.tar.xz mirror://gentoo/texlive-module-numberedblock.doc-2016.tar.xz mirror://gentoo/texlive-module-numname.doc-2016.tar.xz mirror://gentoo/texlive-module-numprint.doc-2016.tar.xz mirror://gentoo/texlive-module-ocg-p.doc-2016.tar.xz mirror://gentoo/texlive-module-ocgx.doc-2016.tar.xz mirror://gentoo/texlive-module-ocgx2.doc-2016.tar.xz mirror://gentoo/texlive-module-ocr-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-octavo.doc-2016.tar.xz mirror://gentoo/texlive-module-oldstyle.doc-2016.tar.xz mirror://gentoo/texlive-module-onlyamsmath.doc-2016.tar.xz mirror://gentoo/texlive-module-opcit.doc-2016.tar.xz mirror://gentoo/texlive-module-optidef.doc-2016.tar.xz mirror://gentoo/texlive-module-optional.doc-2016.tar.xz mirror://gentoo/texlive-module-options.doc-2016.tar.xz mirror://gentoo/texlive-module-outline.doc-2016.tar.xz mirror://gentoo/texlive-module-outliner.doc-2016.tar.xz mirror://gentoo/texlive-module-outlines.doc-2016.tar.xz mirror://gentoo/texlive-module-overlays.doc-2016.tar.xz mirror://gentoo/texlive-module-overpic.doc-2016.tar.xz mirror://gentoo/texlive-module-pagecolor.doc-2016.tar.xz mirror://gentoo/texlive-module-pagecont.doc-2016.tar.xz mirror://gentoo/texlive-module-pagenote.doc-2016.tar.xz mirror://gentoo/texlive-module-pagerange.doc-2016.tar.xz mirror://gentoo/texlive-module-pageslts.doc-2016.tar.xz mirror://gentoo/texlive-module-paper.doc-2016.tar.xz mirror://gentoo/texlive-module-papercdcase.doc-2016.tar.xz mirror://gentoo/texlive-module-papermas.doc-2016.tar.xz mirror://gentoo/texlive-module-papertex.doc-2016.tar.xz mirror://gentoo/texlive-module-paracol.doc-2016.tar.xz mirror://gentoo/texlive-module-parades.doc-2016.tar.xz mirror://gentoo/texlive-module-paralist.doc-2016.tar.xz mirror://gentoo/texlive-module-paresse.doc-2016.tar.xz mirror://gentoo/texlive-module-parnotes.doc-2016.tar.xz mirror://gentoo/texlive-module-parselines.doc-2016.tar.xz mirror://gentoo/texlive-module-pas-cours.doc-2016.tar.xz mirror://gentoo/texlive-module-pas-cv.doc-2016.tar.xz mirror://gentoo/texlive-module-pas-tableur.doc-2016.tar.xz mirror://gentoo/texlive-module-patchcmd.doc-2016.tar.xz mirror://gentoo/texlive-module-pauldoc.doc-2016.tar.xz mirror://gentoo/texlive-module-pawpict.doc-2016.tar.xz mirror://gentoo/texlive-module-pbox.doc-2016.tar.xz mirror://gentoo/texlive-module-pbsheet.doc-2016.tar.xz mirror://gentoo/texlive-module-pdf14.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfcomment.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfcprot.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfmarginpar.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfpagediff.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfscreen.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfslide.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfsync.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfwin.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfx.doc-2016.tar.xz mirror://gentoo/texlive-module-pecha.doc-2016.tar.xz mirror://gentoo/texlive-module-perltex.doc-2016.tar.xz mirror://gentoo/texlive-module-permute.doc-2016.tar.xz mirror://gentoo/texlive-module-petiteannonce.doc-2016.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.doc-2016.tar.xz mirror://gentoo/texlive-module-phfnote.doc-2016.tar.xz mirror://gentoo/texlive-module-phfparen.doc-2016.tar.xz mirror://gentoo/texlive-module-phfqit.doc-2016.tar.xz mirror://gentoo/texlive-module-phfquotetext.doc-2016.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.doc-2016.tar.xz mirror://gentoo/texlive-module-phfthm.doc-2016.tar.xz mirror://gentoo/texlive-module-philex.doc-2016.tar.xz mirror://gentoo/texlive-module-phonenumbers.doc-2016.tar.xz mirror://gentoo/texlive-module-photo.doc-2016.tar.xz mirror://gentoo/texlive-module-piff.doc-2016.tar.xz mirror://gentoo/texlive-module-pkgloader.doc-2016.tar.xz mirror://gentoo/texlive-module-placeins.doc-2016.tar.xz mirror://gentoo/texlive-module-plantslabels.doc-2016.tar.xz mirror://gentoo/texlive-module-plates.doc-2016.tar.xz mirror://gentoo/texlive-module-plweb.doc-2016.tar.xz mirror://gentoo/texlive-module-polynom.doc-2016.tar.xz mirror://gentoo/texlive-module-polynomial.doc-2016.tar.xz mirror://gentoo/texlive-module-polytable.doc-2016.tar.xz mirror://gentoo/texlive-module-postcards.doc-2016.tar.xz mirror://gentoo/texlive-module-poster-mac.doc-2016.tar.xz mirror://gentoo/texlive-module-ppr-prv.doc-2016.tar.xz mirror://gentoo/texlive-module-preprint.doc-2016.tar.xz mirror://gentoo/texlive-module-pressrelease.doc-2016.tar.xz mirror://gentoo/texlive-module-prettyref.doc-2016.tar.xz mirror://gentoo/texlive-module-preview.doc-2016.tar.xz mirror://gentoo/texlive-module-printlen.doc-2016.tar.xz mirror://gentoo/texlive-module-probsoln.doc-2016.tar.xz mirror://gentoo/texlive-module-program.doc-2016.tar.xz mirror://gentoo/texlive-module-progress.doc-2016.tar.xz mirror://gentoo/texlive-module-progressbar.doc-2016.tar.xz mirror://gentoo/texlive-module-proofread.doc-2016.tar.xz mirror://gentoo/texlive-module-properties.doc-2016.tar.xz mirror://gentoo/texlive-module-prosper.doc-2016.tar.xz mirror://gentoo/texlive-module-protex.doc-2016.tar.xz mirror://gentoo/texlive-module-protocol.doc-2016.tar.xz mirror://gentoo/texlive-module-psfragx.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-pdf.doc-2016.tar.xz mirror://gentoo/texlive-module-pstool.doc-2016.tar.xz mirror://gentoo/texlive-module-pstring.doc-2016.tar.xz mirror://gentoo/texlive-module-pxgreeks.doc-2016.tar.xz mirror://gentoo/texlive-module-python.doc-2016.tar.xz mirror://gentoo/texlive-module-qcm.doc-2016.tar.xz mirror://gentoo/texlive-module-qstest.doc-2016.tar.xz mirror://gentoo/texlive-module-qsymbols.doc-2016.tar.xz mirror://gentoo/texlive-module-quicktype.doc-2016.tar.xz mirror://gentoo/texlive-module-quotchap.doc-2016.tar.xz mirror://gentoo/texlive-module-quoting.doc-2016.tar.xz mirror://gentoo/texlive-module-quotmark.doc-2016.tar.xz mirror://gentoo/texlive-module-ran_toks.doc-2016.tar.xz mirror://gentoo/texlive-module-randtext.doc-2016.tar.xz mirror://gentoo/texlive-module-rccol.doc-2016.tar.xz mirror://gentoo/texlive-module-rcs-multi.doc-2016.tar.xz mirror://gentoo/texlive-module-rcsinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-readarray.doc-2016.tar.xz mirror://gentoo/texlive-module-realboxes.doc-2016.tar.xz mirror://gentoo/texlive-module-recipe.doc-2016.tar.xz mirror://gentoo/texlive-module-recipebook.doc-2016.tar.xz mirror://gentoo/texlive-module-recipecard.doc-2016.tar.xz mirror://gentoo/texlive-module-rectopma.doc-2016.tar.xz mirror://gentoo/texlive-module-refcheck.doc-2016.tar.xz mirror://gentoo/texlive-module-refenums.doc-2016.tar.xz mirror://gentoo/texlive-module-reflectgraphics.doc-2016.tar.xz mirror://gentoo/texlive-module-refman.doc-2016.tar.xz mirror://gentoo/texlive-module-refstyle.doc-2016.tar.xz mirror://gentoo/texlive-module-regcount.doc-2016.tar.xz mirror://gentoo/texlive-module-regexpatch.doc-2016.tar.xz mirror://gentoo/texlive-module-register.doc-2016.tar.xz mirror://gentoo/texlive-module-regstats.doc-2016.tar.xz mirror://gentoo/texlive-module-relenc.doc-2016.tar.xz mirror://gentoo/texlive-module-relsize.doc-2016.tar.xz mirror://gentoo/texlive-module-repeatindex.doc-2016.tar.xz mirror://gentoo/texlive-module-repltext.doc-2016.tar.xz mirror://gentoo/texlive-module-rjlparshap.doc-2016.tar.xz mirror://gentoo/texlive-module-rlepsf.doc-2016.tar.xz mirror://gentoo/texlive-module-rmpage.doc-2016.tar.xz mirror://gentoo/texlive-module-robustcommand.doc-2016.tar.xz mirror://gentoo/texlive-module-robustindex.doc-2016.tar.xz mirror://gentoo/texlive-module-romanbar.doc-2016.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.doc-2016.tar.xz mirror://gentoo/texlive-module-romanneg.doc-2016.tar.xz mirror://gentoo/texlive-module-romannum.doc-2016.tar.xz mirror://gentoo/texlive-module-rotfloat.doc-2016.tar.xz mirror://gentoo/texlive-module-rotpages.doc-2016.tar.xz mirror://gentoo/texlive-module-roundbox.doc-2016.tar.xz mirror://gentoo/texlive-module-rterface.doc-2016.tar.xz mirror://gentoo/texlive-module-rtkinenc.doc-2016.tar.xz mirror://gentoo/texlive-module-rulercompass.doc-2016.tar.xz mirror://gentoo/texlive-module-rvwrite.doc-2016.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut.doc-2016.tar.xz mirror://gentoo/texlive-module-sauerj.doc-2016.tar.xz mirror://gentoo/texlive-module-savefnmark.doc-2016.tar.xz mirror://gentoo/texlive-module-savetrees.doc-2016.tar.xz mirror://gentoo/texlive-module-scale.doc-2016.tar.xz mirror://gentoo/texlive-module-scalebar.doc-2016.tar.xz mirror://gentoo/texlive-module-scalerel.doc-2016.tar.xz mirror://gentoo/texlive-module-scanpages.doc-2016.tar.xz mirror://gentoo/texlive-module-scrlttr2copy.doc-2016.tar.xz mirror://gentoo/texlive-module-sdrt.doc-2016.tar.xz mirror://gentoo/texlive-module-secdot.doc-2016.tar.xz mirror://gentoo/texlive-module-sectionbox.doc-2016.tar.xz mirror://gentoo/texlive-module-sectsty.doc-2016.tar.xz mirror://gentoo/texlive-module-seealso.doc-2016.tar.xz mirror://gentoo/texlive-module-selectp.doc-2016.tar.xz mirror://gentoo/texlive-module-semantic.doc-2016.tar.xz mirror://gentoo/texlive-module-semantic-markup.doc-2016.tar.xz mirror://gentoo/texlive-module-semioneside.doc-2016.tar.xz mirror://gentoo/texlive-module-semproc.doc-2016.tar.xz mirror://gentoo/texlive-module-sepfootnotes.doc-2016.tar.xz mirror://gentoo/texlive-module-seqsplit.doc-2016.tar.xz mirror://gentoo/texlive-module-sf298.doc-2016.tar.xz mirror://gentoo/texlive-module-sffms.doc-2016.tar.xz mirror://gentoo/texlive-module-shadethm.doc-2016.tar.xz mirror://gentoo/texlive-module-shadow.doc-2016.tar.xz mirror://gentoo/texlive-module-shadowtext.doc-2016.tar.xz mirror://gentoo/texlive-module-shapepar.doc-2016.tar.xz mirror://gentoo/texlive-module-shdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-shipunov.doc-2016.tar.xz mirror://gentoo/texlive-module-shorttoc.doc-2016.tar.xz mirror://gentoo/texlive-module-show2e.doc-2016.tar.xz mirror://gentoo/texlive-module-showcharinbox.doc-2016.tar.xz mirror://gentoo/texlive-module-showdim.doc-2016.tar.xz mirror://gentoo/texlive-module-showexpl.doc-2016.tar.xz mirror://gentoo/texlive-module-showlabels.doc-2016.tar.xz mirror://gentoo/texlive-module-sidecap.doc-2016.tar.xz mirror://gentoo/texlive-module-sidenotes.doc-2016.tar.xz mirror://gentoo/texlive-module-silence.doc-2016.tar.xz mirror://gentoo/texlive-module-simplecd.doc-2016.tar.xz mirror://gentoo/texlive-module-simplecv.doc-2016.tar.xz mirror://gentoo/texlive-module-sitem.doc-2016.tar.xz mirror://gentoo/texlive-module-skb.doc-2016.tar.xz mirror://gentoo/texlive-module-skdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-skeycommand.doc-2016.tar.xz mirror://gentoo/texlive-module-skeyval.doc-2016.tar.xz mirror://gentoo/texlive-module-skrapport.doc-2016.tar.xz mirror://gentoo/texlive-module-slantsc.doc-2016.tar.xz mirror://gentoo/texlive-module-smalltableof.doc-2016.tar.xz mirror://gentoo/texlive-module-smartunits.doc-2016.tar.xz mirror://gentoo/texlive-module-smartref.doc-2016.tar.xz mirror://gentoo/texlive-module-snapshot.doc-2016.tar.xz mirror://gentoo/texlive-module-snotez.doc-2016.tar.xz mirror://gentoo/texlive-module-soul.doc-2016.tar.xz mirror://gentoo/texlive-module-sparklines.doc-2016.tar.xz mirror://gentoo/texlive-module-sphack.doc-2016.tar.xz mirror://gentoo/texlive-module-splitindex.doc-2016.tar.xz mirror://gentoo/texlive-module-spot.doc-2016.tar.xz mirror://gentoo/texlive-module-spotcolor.doc-2016.tar.xz mirror://gentoo/texlive-module-spreadtab.doc-2016.tar.xz mirror://gentoo/texlive-module-spverbatim.doc-2016.tar.xz mirror://gentoo/texlive-module-srbook-mem.doc-2016.tar.xz mirror://gentoo/texlive-module-srcltx.doc-2016.tar.xz mirror://gentoo/texlive-module-sseq.doc-2016.tar.xz mirror://gentoo/texlive-module-sslides.doc-2016.tar.xz mirror://gentoo/texlive-module-stackengine.doc-2016.tar.xz mirror://gentoo/texlive-module-standalone.doc-2016.tar.xz mirror://gentoo/texlive-module-statistik.doc-2016.tar.xz mirror://gentoo/texlive-module-stdclsdv.doc-2016.tar.xz mirror://gentoo/texlive-module-stdpage.doc-2016.tar.xz mirror://gentoo/texlive-module-stex.doc-2016.tar.xz mirror://gentoo/texlive-module-storebox.doc-2016.tar.xz mirror://gentoo/texlive-module-storecmd.doc-2016.tar.xz mirror://gentoo/texlive-module-stringstrings.doc-2016.tar.xz mirror://gentoo/texlive-module-sttools.doc-2016.tar.xz mirror://gentoo/texlive-module-stubs.doc-2016.tar.xz mirror://gentoo/texlive-module-subdepth.doc-2016.tar.xz mirror://gentoo/texlive-module-subeqn.doc-2016.tar.xz mirror://gentoo/texlive-module-subeqnarray.doc-2016.tar.xz mirror://gentoo/texlive-module-subfigmat.doc-2016.tar.xz mirror://gentoo/texlive-module-subfigure.doc-2016.tar.xz mirror://gentoo/texlive-module-subfiles.doc-2016.tar.xz mirror://gentoo/texlive-module-subfloat.doc-2016.tar.xz mirror://gentoo/texlive-module-substitutefont.doc-2016.tar.xz mirror://gentoo/texlive-module-substr.doc-2016.tar.xz mirror://gentoo/texlive-module-supertabular.doc-2016.tar.xz mirror://gentoo/texlive-module-svg.doc-2016.tar.xz mirror://gentoo/texlive-module-svgcolor.doc-2016.tar.xz mirror://gentoo/texlive-module-svn.doc-2016.tar.xz mirror://gentoo/texlive-module-svn-multi.doc-2016.tar.xz mirror://gentoo/texlive-module-svn-prov.doc-2016.tar.xz mirror://gentoo/texlive-module-syntax.doc-2016.tar.xz mirror://gentoo/texlive-module-syntrace.doc-2016.tar.xz mirror://gentoo/texlive-module-synttree.doc-2016.tar.xz mirror://gentoo/texlive-module-tabfigures.doc-2016.tar.xz mirror://gentoo/texlive-module-tableaux.doc-2016.tar.xz mirror://gentoo/texlive-module-tablefootnote.doc-2016.tar.xz mirror://gentoo/texlive-module-tableof.doc-2016.tar.xz mirror://gentoo/texlive-module-tablestyles.doc-2016.tar.xz mirror://gentoo/texlive-module-tablists.doc-2016.tar.xz mirror://gentoo/texlive-module-tabls.doc-2016.tar.xz mirror://gentoo/texlive-module-tabstackengine.doc-2016.tar.xz mirror://gentoo/texlive-module-tabto-ltx.doc-2016.tar.xz mirror://gentoo/texlive-module-tabu.doc-2016.tar.xz mirror://gentoo/texlive-module-tabularborder.doc-2016.tar.xz mirror://gentoo/texlive-module-tabularcalc.doc-2016.tar.xz mirror://gentoo/texlive-module-tabularew.doc-2016.tar.xz mirror://gentoo/texlive-module-tabulary.doc-2016.tar.xz mirror://gentoo/texlive-module-tagging.doc-2016.tar.xz mirror://gentoo/texlive-module-tagpair.doc-2016.tar.xz mirror://gentoo/texlive-module-talk.doc-2016.tar.xz mirror://gentoo/texlive-module-tamefloats.doc-2016.tar.xz mirror://gentoo/texlive-module-tasks.doc-2016.tar.xz mirror://gentoo/texlive-module-tcldoc.doc-2016.tar.xz mirror://gentoo/texlive-module-tcolorbox.doc-2016.tar.xz mirror://gentoo/texlive-module-tdclock.doc-2016.tar.xz mirror://gentoo/texlive-module-technics.doc-2016.tar.xz mirror://gentoo/texlive-module-ted.doc-2016.tar.xz mirror://gentoo/texlive-module-templatetools.doc-2016.tar.xz mirror://gentoo/texlive-module-termcal.doc-2016.tar.xz mirror://gentoo/texlive-module-termlist.doc-2016.tar.xz mirror://gentoo/texlive-module-testhyphens.doc-2016.tar.xz mirror://gentoo/texlive-module-testidx.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-label.doc-2016.tar.xz mirror://gentoo/texlive-module-texmate.doc-2016.tar.xz mirror://gentoo/texlive-module-texments.doc-2016.tar.xz mirror://gentoo/texlive-module-texpower.doc-2016.tar.xz mirror://gentoo/texlive-module-texshade.doc-2016.tar.xz mirror://gentoo/texlive-module-texvc.doc-2016.tar.xz mirror://gentoo/texlive-module-textfit.doc-2016.tar.xz mirror://gentoo/texlive-module-textgreek.doc-2016.tar.xz mirror://gentoo/texlive-module-textmerg.doc-2016.tar.xz mirror://gentoo/texlive-module-textpos.doc-2016.tar.xz mirror://gentoo/texlive-module-theoremref.doc-2016.tar.xz mirror://gentoo/texlive-module-thinsp.doc-2016.tar.xz mirror://gentoo/texlive-module-thmtools.doc-2016.tar.xz mirror://gentoo/texlive-module-threadcol.doc-2016.tar.xz mirror://gentoo/texlive-module-threeparttable.doc-2016.tar.xz mirror://gentoo/texlive-module-threeparttablex.doc-2016.tar.xz mirror://gentoo/texlive-module-thumb.doc-2016.tar.xz mirror://gentoo/texlive-module-thumbs.doc-2016.tar.xz mirror://gentoo/texlive-module-thumby.doc-2016.tar.xz mirror://gentoo/texlive-module-ticket.doc-2016.tar.xz mirror://gentoo/texlive-module-titlecaps.doc-2016.tar.xz mirror://gentoo/texlive-module-titlepic.doc-2016.tar.xz mirror://gentoo/texlive-module-titleref.doc-2016.tar.xz mirror://gentoo/texlive-module-titlesec.doc-2016.tar.xz mirror://gentoo/texlive-module-titling.doc-2016.tar.xz mirror://gentoo/texlive-module-tocbibind.doc-2016.tar.xz mirror://gentoo/texlive-module-tocdata.doc-2016.tar.xz mirror://gentoo/texlive-module-tocloft.doc-2016.tar.xz mirror://gentoo/texlive-module-tocvsec2.doc-2016.tar.xz mirror://gentoo/texlive-module-todo.doc-2016.tar.xz mirror://gentoo/texlive-module-todonotes.doc-2016.tar.xz mirror://gentoo/texlive-module-tokenizer.doc-2016.tar.xz mirror://gentoo/texlive-module-toolbox.doc-2016.tar.xz mirror://gentoo/texlive-module-topfloat.doc-2016.tar.xz mirror://gentoo/texlive-module-totcount.doc-2016.tar.xz mirror://gentoo/texlive-module-totpages.doc-2016.tar.xz mirror://gentoo/texlive-module-translations.doc-2016.tar.xz mirror://gentoo/texlive-module-trfsigns.doc-2016.tar.xz mirror://gentoo/texlive-module-trimspaces.doc-2016.tar.xz mirror://gentoo/texlive-module-trivfloat.doc-2016.tar.xz mirror://gentoo/texlive-module-trsym.doc-2016.tar.xz mirror://gentoo/texlive-module-truncate.doc-2016.tar.xz mirror://gentoo/texlive-module-tucv.doc-2016.tar.xz mirror://gentoo/texlive-module-turnthepage.doc-2016.tar.xz mirror://gentoo/texlive-module-twoinone.doc-2016.tar.xz mirror://gentoo/texlive-module-twoup.doc-2016.tar.xz mirror://gentoo/texlive-module-txgreeks.doc-2016.tar.xz mirror://gentoo/texlive-module-type1cm.doc-2016.tar.xz mirror://gentoo/texlive-module-typed-checklist.doc-2016.tar.xz mirror://gentoo/texlive-module-typeface.doc-2016.tar.xz mirror://gentoo/texlive-module-typogrid.doc-2016.tar.xz mirror://gentoo/texlive-module-uassign.doc-2016.tar.xz mirror://gentoo/texlive-module-ucs.doc-2016.tar.xz mirror://gentoo/texlive-module-uebungsblatt.doc-2016.tar.xz mirror://gentoo/texlive-module-umoline.doc-2016.tar.xz mirror://gentoo/texlive-module-underlin.doc-2016.tar.xz mirror://gentoo/texlive-module-underoverlap.doc-2016.tar.xz mirror://gentoo/texlive-module-undolabl.doc-2016.tar.xz mirror://gentoo/texlive-module-units.doc-2016.tar.xz mirror://gentoo/texlive-module-unravel.doc-2016.tar.xz mirror://gentoo/texlive-module-upmethodology.doc-2016.tar.xz mirror://gentoo/texlive-module-upquote.doc-2016.tar.xz mirror://gentoo/texlive-module-uri.doc-2016.tar.xz mirror://gentoo/texlive-module-ushort.doc-2016.tar.xz mirror://gentoo/texlive-module-uspace.doc-2016.tar.xz mirror://gentoo/texlive-module-uwmslide.doc-2016.tar.xz mirror://gentoo/texlive-module-varindex.doc-2016.tar.xz mirror://gentoo/texlive-module-varsfromjobname.doc-2016.tar.xz mirror://gentoo/texlive-module-varwidth.doc-2016.tar.xz mirror://gentoo/texlive-module-vdmlisting.doc-2016.tar.xz mirror://gentoo/texlive-module-verbasef.doc-2016.tar.xz mirror://gentoo/texlive-module-verbatimbox.doc-2016.tar.xz mirror://gentoo/texlive-module-verbatimcopy.doc-2016.tar.xz mirror://gentoo/texlive-module-verbdef.doc-2016.tar.xz mirror://gentoo/texlive-module-verbments.doc-2016.tar.xz mirror://gentoo/texlive-module-version.doc-2016.tar.xz mirror://gentoo/texlive-module-versions.doc-2016.tar.xz mirror://gentoo/texlive-module-versonotes.doc-2016.tar.xz mirror://gentoo/texlive-module-vertbars.doc-2016.tar.xz mirror://gentoo/texlive-module-vgrid.doc-2016.tar.xz mirror://gentoo/texlive-module-vhistory.doc-2016.tar.xz mirror://gentoo/texlive-module-vmargin.doc-2016.tar.xz mirror://gentoo/texlive-module-volumes.doc-2016.tar.xz mirror://gentoo/texlive-module-vpe.doc-2016.tar.xz mirror://gentoo/texlive-module-vruler.doc-2016.tar.xz mirror://gentoo/texlive-module-vwcol.doc-2016.tar.xz mirror://gentoo/texlive-module-wallpaper.doc-2016.tar.xz mirror://gentoo/texlive-module-warning.doc-2016.tar.xz mirror://gentoo/texlive-module-warpcol.doc-2016.tar.xz mirror://gentoo/texlive-module-was.doc-2016.tar.xz mirror://gentoo/texlive-module-widetable.doc-2016.tar.xz mirror://gentoo/texlive-module-williams.doc-2016.tar.xz mirror://gentoo/texlive-module-withargs.doc-2016.tar.xz mirror://gentoo/texlive-module-wordcount.doc-2016.tar.xz mirror://gentoo/texlive-module-wordlike.doc-2016.tar.xz mirror://gentoo/texlive-module-wrapfig.doc-2016.tar.xz mirror://gentoo/texlive-module-wtref.doc-2016.tar.xz mirror://gentoo/texlive-module-xargs.doc-2016.tar.xz mirror://gentoo/texlive-module-xassoccnt.doc-2016.tar.xz mirror://gentoo/texlive-module-xcntperchap.doc-2016.tar.xz mirror://gentoo/texlive-module-xcolor-material.doc-2016.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.doc-2016.tar.xz mirror://gentoo/texlive-module-xcomment.doc-2016.tar.xz mirror://gentoo/texlive-module-xdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-xellipsis.doc-2016.tar.xz mirror://gentoo/texlive-module-xfor.doc-2016.tar.xz mirror://gentoo/texlive-module-xhfill.doc-2016.tar.xz mirror://gentoo/texlive-module-xifthen.doc-2016.tar.xz mirror://gentoo/texlive-module-xint.doc-2016.tar.xz mirror://gentoo/texlive-module-xmpincl.doc-2016.tar.xz mirror://gentoo/texlive-module-xnewcommand.doc-2016.tar.xz mirror://gentoo/texlive-module-xoptarg.doc-2016.tar.xz mirror://gentoo/texlive-module-xpatch.doc-2016.tar.xz mirror://gentoo/texlive-module-xpeek.doc-2016.tar.xz mirror://gentoo/texlive-module-xprintlen.doc-2016.tar.xz mirror://gentoo/texlive-module-xpunctuate.doc-2016.tar.xz mirror://gentoo/texlive-module-xsavebox.doc-2016.tar.xz mirror://gentoo/texlive-module-xstring.doc-2016.tar.xz mirror://gentoo/texlive-module-xtab.doc-2016.tar.xz mirror://gentoo/texlive-module-xwatermark.doc-2016.tar.xz mirror://gentoo/texlive-module-xytree.doc-2016.tar.xz mirror://gentoo/texlive-module-yafoot.doc-2016.tar.xz mirror://gentoo/texlive-module-yaletter.doc-2016.tar.xz mirror://gentoo/texlive-module-yagusylo.doc-2016.tar.xz mirror://gentoo/texlive-module-ycbook.doc-2016.tar.xz mirror://gentoo/texlive-module-ydoc.doc-2016.tar.xz mirror://gentoo/texlive-module-yplan.doc-2016.tar.xz mirror://gentoo/texlive-module-zed-csp.doc-2016.tar.xz mirror://gentoo/texlive-module-ziffer.doc-2016.tar.xz mirror://gentoo/texlive-module-zwgetfdate.doc-2016.tar.xz mirror://gentoo/texlive-module-zwpagelayout.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-ESIEEcv.source-2016.tar.xz mirror://gentoo/texlive-module-GS1.source-2016.tar.xz mirror://gentoo/texlive-module-HA-prosper.source-2016.tar.xz mirror://gentoo/texlive-module-Tabbing.source-2016.tar.xz mirror://gentoo/texlive-module-abstract.source-2016.tar.xz mirror://gentoo/texlive-module-achemso.source-2016.tar.xz mirror://gentoo/texlive-module-acronym.source-2016.tar.xz mirror://gentoo/texlive-module-acroterm.source-2016.tar.xz mirror://gentoo/texlive-module-addlines.source-2016.tar.xz mirror://gentoo/texlive-module-adjmulticol.source-2016.tar.xz mirror://gentoo/texlive-module-adjustbox.source-2016.tar.xz mirror://gentoo/texlive-module-adrconv.source-2016.tar.xz mirror://gentoo/texlive-module-alertmessage.source-2016.tar.xz mirror://gentoo/texlive-module-alnumsec.source-2016.tar.xz mirror://gentoo/texlive-module-altfont.source-2016.tar.xz mirror://gentoo/texlive-module-amsaddr.source-2016.tar.xz mirror://gentoo/texlive-module-animate.source-2016.tar.xz mirror://gentoo/texlive-module-answers.source-2016.tar.xz mirror://gentoo/texlive-module-appendix.source-2016.tar.xz mirror://gentoo/texlive-module-apptools.source-2016.tar.xz mirror://gentoo/texlive-module-arcs.source-2016.tar.xz mirror://gentoo/texlive-module-arraysort.source-2016.tar.xz mirror://gentoo/texlive-module-arydshln.source-2016.tar.xz mirror://gentoo/texlive-module-asciilist.source-2016.tar.xz mirror://gentoo/texlive-module-attachfile.source-2016.tar.xz mirror://gentoo/texlive-module-autonum.source-2016.tar.xz mirror://gentoo/texlive-module-autopdf.source-2016.tar.xz mirror://gentoo/texlive-module-avremu.source-2016.tar.xz mirror://gentoo/texlive-module-background.source-2016.tar.xz mirror://gentoo/texlive-module-basicarith.source-2016.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.source-2016.tar.xz mirror://gentoo/texlive-module-beamersubframe.source-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.source-2016.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.source-2016.tar.xz mirror://gentoo/texlive-module-beton.source-2016.tar.xz mirror://gentoo/texlive-module-bewerbung.source-2016.tar.xz mirror://gentoo/texlive-module-bez123.source-2016.tar.xz mirror://gentoo/texlive-module-bhcexam.source-2016.tar.xz mirror://gentoo/texlive-module-bigfoot.source-2016.tar.xz mirror://gentoo/texlive-module-bizcard.source-2016.tar.xz mirror://gentoo/texlive-module-blindtext.source-2016.tar.xz mirror://gentoo/texlive-module-bnumexpr.source-2016.tar.xz mirror://gentoo/texlive-module-boites.source-2016.tar.xz mirror://gentoo/texlive-module-bookcover.source-2016.tar.xz mirror://gentoo/texlive-module-booklet.source-2016.tar.xz mirror://gentoo/texlive-module-boolexpr.source-2016.tar.xz mirror://gentoo/texlive-module-bophook.source-2016.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.source-2016.tar.xz mirror://gentoo/texlive-module-boxhandler.source-2016.tar.xz mirror://gentoo/texlive-module-breakurl.source-2016.tar.xz mirror://gentoo/texlive-module-bullcntr.source-2016.tar.xz mirror://gentoo/texlive-module-calcage.source-2016.tar.xz mirror://gentoo/texlive-module-calculator.source-2016.tar.xz mirror://gentoo/texlive-module-cals.source-2016.tar.xz mirror://gentoo/texlive-module-canoniclayout.source-2016.tar.xz mirror://gentoo/texlive-module-capt-of.source-2016.tar.xz mirror://gentoo/texlive-module-captcont.source-2016.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.source-2016.tar.xz mirror://gentoo/texlive-module-catechis.source-2016.tar.xz mirror://gentoo/texlive-module-ccaption.source-2016.tar.xz mirror://gentoo/texlive-module-cclicenses.source-2016.tar.xz mirror://gentoo/texlive-module-cd.source-2016.tar.xz mirror://gentoo/texlive-module-cd-cover.source-2016.tar.xz mirror://gentoo/texlive-module-cdpbundl.source-2016.tar.xz mirror://gentoo/texlive-module-changebar.source-2016.tar.xz mirror://gentoo/texlive-module-changepage.source-2016.tar.xz mirror://gentoo/texlive-module-changes.source-2016.tar.xz mirror://gentoo/texlive-module-chappg.source-2016.tar.xz mirror://gentoo/texlive-module-chapterfolder.source-2016.tar.xz mirror://gentoo/texlive-module-chextras.source-2016.tar.xz mirror://gentoo/texlive-module-chletter.source-2016.tar.xz mirror://gentoo/texlive-module-circ.source-2016.tar.xz mirror://gentoo/texlive-module-clefval.source-2016.tar.xz mirror://gentoo/texlive-module-cleveref.source-2016.tar.xz mirror://gentoo/texlive-module-cmdtrack.source-2016.tar.xz mirror://gentoo/texlive-module-codepage.source-2016.tar.xz mirror://gentoo/texlive-module-codesection.source-2016.tar.xz mirror://gentoo/texlive-module-collcell.source-2016.tar.xz mirror://gentoo/texlive-module-collectbox.source-2016.tar.xz mirror://gentoo/texlive-module-colordoc.source-2016.tar.xz mirror://gentoo/texlive-module-colorwav.source-2016.tar.xz mirror://gentoo/texlive-module-colorweb.source-2016.tar.xz mirror://gentoo/texlive-module-combine.source-2016.tar.xz mirror://gentoo/texlive-module-commado.source-2016.tar.xz mirror://gentoo/texlive-module-constants.source-2016.tar.xz mirror://gentoo/texlive-module-continue.source-2016.tar.xz mirror://gentoo/texlive-module-contour.source-2016.tar.xz mirror://gentoo/texlive-module-contracard.source-2016.tar.xz mirror://gentoo/texlive-module-conv-xkv.source-2016.tar.xz mirror://gentoo/texlive-module-cooking.source-2016.tar.xz mirror://gentoo/texlive-module-cooking-units.source-2016.tar.xz mirror://gentoo/texlive-module-cool.source-2016.tar.xz mirror://gentoo/texlive-module-coollist.source-2016.tar.xz mirror://gentoo/texlive-module-coolstr.source-2016.tar.xz mirror://gentoo/texlive-module-coolthms.source-2016.tar.xz mirror://gentoo/texlive-module-cooltooltips.source-2016.tar.xz mirror://gentoo/texlive-module-coordsys.source-2016.tar.xz mirror://gentoo/texlive-module-copyedit.source-2016.tar.xz mirror://gentoo/texlive-module-counttexruns.source-2016.tar.xz mirror://gentoo/texlive-module-coverpage.source-2016.tar.xz mirror://gentoo/texlive-module-cprotect.source-2016.tar.xz mirror://gentoo/texlive-module-crossreference.source-2016.tar.xz mirror://gentoo/texlive-module-cuisine.source-2016.tar.xz mirror://gentoo/texlive-module-currfile.source-2016.tar.xz mirror://gentoo/texlive-module-cutwin.source-2016.tar.xz mirror://gentoo/texlive-module-cyber.source-2016.tar.xz mirror://gentoo/texlive-module-cybercic.source-2016.tar.xz mirror://gentoo/texlive-module-dashbox.source-2016.tar.xz mirror://gentoo/texlive-module-dashrule.source-2016.tar.xz mirror://gentoo/texlive-module-datatool.source-2016.tar.xz mirror://gentoo/texlive-module-dateiliste.source-2016.tar.xz mirror://gentoo/texlive-module-datenumber.source-2016.tar.xz mirror://gentoo/texlive-module-datetime.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-basque.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-breton.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-czech.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-danish.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-english.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-french.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-galician.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-german.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-greek.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-irish.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-italian.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-latin.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-polish.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-russian.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-samin.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.source-2016.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.source-2016.tar.xz mirror://gentoo/texlive-module-decimal.source-2016.tar.xz mirror://gentoo/texlive-module-decorule.source-2016.tar.xz mirror://gentoo/texlive-module-delimtxt.source-2016.tar.xz mirror://gentoo/texlive-module-denisbdoc.source-2016.tar.xz mirror://gentoo/texlive-module-diagbox.source-2016.tar.xz mirror://gentoo/texlive-module-dialogl.source-2016.tar.xz mirror://gentoo/texlive-module-dinbrief.source-2016.tar.xz mirror://gentoo/texlive-module-dirtytalk.source-2016.tar.xz mirror://gentoo/texlive-module-dnaseq.source-2016.tar.xz mirror://gentoo/texlive-module-doclicense.source-2016.tar.xz mirror://gentoo/texlive-module-docmfp.source-2016.tar.xz mirror://gentoo/texlive-module-docmute.source-2016.tar.xz mirror://gentoo/texlive-module-doctools.source-2016.tar.xz mirror://gentoo/texlive-module-documentation.source-2016.tar.xz mirror://gentoo/texlive-module-dotarrow.source-2016.tar.xz mirror://gentoo/texlive-module-dotseqn.source-2016.tar.xz mirror://gentoo/texlive-module-download.source-2016.tar.xz mirror://gentoo/texlive-module-dox.source-2016.tar.xz mirror://gentoo/texlive-module-dprogress.source-2016.tar.xz mirror://gentoo/texlive-module-drac.source-2016.tar.xz mirror://gentoo/texlive-module-draftcopy.source-2016.tar.xz mirror://gentoo/texlive-module-draftwatermark.source-2016.tar.xz mirror://gentoo/texlive-module-dtxdescribe.source-2016.tar.xz mirror://gentoo/texlive-module-dtxgallery.source-2016.tar.xz mirror://gentoo/texlive-module-dynamicnumber.source-2016.tar.xz mirror://gentoo/texlive-module-easyfig.source-2016.tar.xz mirror://gentoo/texlive-module-easyreview.source-2016.tar.xz mirror://gentoo/texlive-module-ebezier.source-2016.tar.xz mirror://gentoo/texlive-module-ecclesiastic.source-2016.tar.xz mirror://gentoo/texlive-module-ecv.source-2016.tar.xz mirror://gentoo/texlive-module-ed.source-2016.tar.xz mirror://gentoo/texlive-module-edmargin.source-2016.tar.xz mirror://gentoo/texlive-module-eemeir.source-2016.tar.xz mirror://gentoo/texlive-module-efbox.source-2016.tar.xz mirror://gentoo/texlive-module-egplot.source-2016.tar.xz mirror://gentoo/texlive-module-ellipsis.source-2016.tar.xz mirror://gentoo/texlive-module-elmath.source-2016.tar.xz mirror://gentoo/texlive-module-elocalloc.source-2016.tar.xz mirror://gentoo/texlive-module-elzcards.source-2016.tar.xz mirror://gentoo/texlive-module-emarks.source-2016.tar.xz mirror://gentoo/texlive-module-embedall.source-2016.tar.xz mirror://gentoo/texlive-module-emptypage.source-2016.tar.xz mirror://gentoo/texlive-module-endfloat.source-2016.tar.xz mirror://gentoo/texlive-module-endheads.source-2016.tar.xz mirror://gentoo/texlive-module-engpron.source-2016.tar.xz mirror://gentoo/texlive-module-engrec.source-2016.tar.xz mirror://gentoo/texlive-module-enumitem-zref.source-2016.tar.xz mirror://gentoo/texlive-module-environ.source-2016.tar.xz mirror://gentoo/texlive-module-epigraph.source-2016.tar.xz mirror://gentoo/texlive-module-epiolmec.source-2016.tar.xz mirror://gentoo/texlive-module-eqlist.source-2016.tar.xz mirror://gentoo/texlive-module-eqparbox.source-2016.tar.xz mirror://gentoo/texlive-module-errata.source-2016.tar.xz mirror://gentoo/texlive-module-esdiff.source-2016.tar.xz mirror://gentoo/texlive-module-esint.source-2016.tar.xz mirror://gentoo/texlive-module-etaremune.source-2016.tar.xz mirror://gentoo/texlive-module-etextools.source-2016.tar.xz mirror://gentoo/texlive-module-etoc.source-2016.tar.xz mirror://gentoo/texlive-module-eukdate.source-2016.tar.xz mirror://gentoo/texlive-module-everyhook.source-2016.tar.xz mirror://gentoo/texlive-module-everypage.source-2016.tar.xz mirror://gentoo/texlive-module-exam-n.source-2016.tar.xz mirror://gentoo/texlive-module-examdesign.source-2016.tar.xz mirror://gentoo/texlive-module-exercise.source-2016.tar.xz mirror://gentoo/texlive-module-exercises.source-2016.tar.xz mirror://gentoo/texlive-module-exp-testopt.source-2016.tar.xz mirror://gentoo/texlive-module-expdlist.source-2016.tar.xz mirror://gentoo/texlive-module-export.source-2016.tar.xz mirror://gentoo/texlive-module-exsol.source-2016.tar.xz mirror://gentoo/texlive-module-extract.source-2016.tar.xz mirror://gentoo/texlive-module-facsimile.source-2016.tar.xz mirror://gentoo/texlive-module-factura.source-2016.tar.xz mirror://gentoo/texlive-module-fancylabel.source-2016.tar.xz mirror://gentoo/texlive-module-fancynum.source-2016.tar.xz mirror://gentoo/texlive-module-fancypar.source-2016.tar.xz mirror://gentoo/texlive-module-fancytabs.source-2016.tar.xz mirror://gentoo/texlive-module-fancytooltips.source-2016.tar.xz mirror://gentoo/texlive-module-fcolumn.source-2016.tar.xz mirror://gentoo/texlive-module-fgruler.source-2016.tar.xz mirror://gentoo/texlive-module-fibeamer.source-2016.tar.xz mirror://gentoo/texlive-module-fifo-stack.source-2016.tar.xz mirror://gentoo/texlive-module-filecontents.source-2016.tar.xz mirror://gentoo/texlive-module-filecontentsdef.source-2016.tar.xz mirror://gentoo/texlive-module-filedate.source-2016.tar.xz mirror://gentoo/texlive-module-filehook.source-2016.tar.xz mirror://gentoo/texlive-module-fileinfo.source-2016.tar.xz mirror://gentoo/texlive-module-fink.source-2016.tar.xz mirror://gentoo/texlive-module-finstrut.source-2016.tar.xz mirror://gentoo/texlive-module-fithesis.source-2016.tar.xz mirror://gentoo/texlive-module-fixcmex.source-2016.tar.xz mirror://gentoo/texlive-module-fixme.source-2016.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.source-2016.tar.xz mirror://gentoo/texlive-module-flabels.source-2016.tar.xz mirror://gentoo/texlive-module-flagderiv.source-2016.tar.xz mirror://gentoo/texlive-module-flashcards.source-2016.tar.xz mirror://gentoo/texlive-module-flippdf.source-2016.tar.xz mirror://gentoo/texlive-module-floatflt.source-2016.tar.xz mirror://gentoo/texlive-module-floatrow.source-2016.tar.xz mirror://gentoo/texlive-module-flowfram.source-2016.tar.xz mirror://gentoo/texlive-module-fmp.source-2016.tar.xz mirror://gentoo/texlive-module-fmtcount.source-2016.tar.xz mirror://gentoo/texlive-module-fnbreak.source-2016.tar.xz mirror://gentoo/texlive-module-fnumprint.source-2016.tar.xz mirror://gentoo/texlive-module-foilhtml.source-2016.tar.xz mirror://gentoo/texlive-module-fontaxes.source-2016.tar.xz mirror://gentoo/texlive-module-fonttable.source-2016.tar.xz mirror://gentoo/texlive-module-footmisc.source-2016.tar.xz mirror://gentoo/texlive-module-footmisx.source-2016.tar.xz mirror://gentoo/texlive-module-footnotehyper.source-2016.tar.xz mirror://gentoo/texlive-module-footnoterange.source-2016.tar.xz mirror://gentoo/texlive-module-footnpag.source-2016.tar.xz mirror://gentoo/texlive-module-forarray.source-2016.tar.xz mirror://gentoo/texlive-module-foreign.source-2016.tar.xz mirror://gentoo/texlive-module-forloop.source-2016.tar.xz mirror://gentoo/texlive-module-formular.source-2016.tar.xz mirror://gentoo/texlive-module-frankenstein.source-2016.tar.xz mirror://gentoo/texlive-module-ftnxtra.source-2016.tar.xz mirror://gentoo/texlive-module-fullblck.source-2016.tar.xz mirror://gentoo/texlive-module-fullminipage.source-2016.tar.xz mirror://gentoo/texlive-module-fundus-calligra.source-2016.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.source-2016.tar.xz mirror://gentoo/texlive-module-fvextra.source-2016.tar.xz mirror://gentoo/texlive-module-gcite.source-2016.tar.xz mirror://gentoo/texlive-module-gender.source-2016.tar.xz mirror://gentoo/texlive-module-genmpage.source-2016.tar.xz mirror://gentoo/texlive-module-getitems.source-2016.tar.xz mirror://gentoo/texlive-module-ginpenc.source-2016.tar.xz mirror://gentoo/texlive-module-gitfile-info.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-danish.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-english.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-extra.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-french.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-german.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-irish.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-italian.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-polish.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.source-2016.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.source-2016.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.source-2016.tar.xz mirror://gentoo/texlive-module-graphbox.source-2016.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.source-2016.tar.xz mirror://gentoo/texlive-module-graphicxbox.source-2016.tar.xz mirror://gentoo/texlive-module-grid.source-2016.tar.xz mirror://gentoo/texlive-module-gridset.source-2016.tar.xz mirror://gentoo/texlive-module-guitlogo.source-2016.tar.xz mirror://gentoo/texlive-module-halloweenmath.source-2016.tar.xz mirror://gentoo/texlive-module-hanging.source-2016.tar.xz mirror://gentoo/texlive-module-hardwrap.source-2016.tar.xz mirror://gentoo/texlive-module-hc.source-2016.tar.xz mirror://gentoo/texlive-module-hhtensor.source-2016.tar.xz mirror://gentoo/texlive-module-histogr.source-2016.tar.xz mirror://gentoo/texlive-module-hpsdiss.source-2016.tar.xz mirror://gentoo/texlive-module-hrefhide.source-2016.tar.xz mirror://gentoo/texlive-module-hyper.source-2016.tar.xz mirror://gentoo/texlive-module-hyperxmp.source-2016.tar.xz mirror://gentoo/texlive-module-hyphenat.source-2016.tar.xz mirror://gentoo/texlive-module-idxlayout.source-2016.tar.xz mirror://gentoo/texlive-module-iffont.source-2016.tar.xz mirror://gentoo/texlive-module-ifmtarg.source-2016.tar.xz mirror://gentoo/texlive-module-ifnextok.source-2016.tar.xz mirror://gentoo/texlive-module-ifoddpage.source-2016.tar.xz mirror://gentoo/texlive-module-ifplatform.source-2016.tar.xz mirror://gentoo/texlive-module-iitem.source-2016.tar.xz mirror://gentoo/texlive-module-imakeidx.source-2016.tar.xz mirror://gentoo/texlive-module-indextools.source-2016.tar.xz mirror://gentoo/texlive-module-inlinedef.source-2016.tar.xz mirror://gentoo/texlive-module-inputtrc.source-2016.tar.xz mirror://gentoo/texlive-module-interfaces.source-2016.tar.xz mirror://gentoo/texlive-module-inversepath.source-2016.tar.xz mirror://gentoo/texlive-module-iso.source-2016.tar.xz mirror://gentoo/texlive-module-iso10303.source-2016.tar.xz mirror://gentoo/texlive-module-isodate.source-2016.tar.xz mirror://gentoo/texlive-module-isodoc.source-2016.tar.xz mirror://gentoo/texlive-module-isorot.source-2016.tar.xz mirror://gentoo/texlive-module-isotope.source-2016.tar.xz mirror://gentoo/texlive-module-issuulinks.source-2016.tar.xz mirror://gentoo/texlive-module-jvlisting.source-2016.tar.xz mirror://gentoo/texlive-module-kantlipsum.source-2016.tar.xz mirror://gentoo/texlive-module-kerntest.source-2016.tar.xz mirror://gentoo/texlive-module-keycommand.source-2016.tar.xz mirror://gentoo/texlive-module-keyfloat.source-2016.tar.xz mirror://gentoo/texlive-module-keyvaltable.source-2016.tar.xz mirror://gentoo/texlive-module-komacv.source-2016.tar.xz mirror://gentoo/texlive-module-ktv-texdata.source-2016.tar.xz mirror://gentoo/texlive-module-l3build.source-2016.tar.xz mirror://gentoo/texlive-module-labbook.source-2016.tar.xz mirror://gentoo/texlive-module-labels.source-2016.tar.xz mirror://gentoo/texlive-module-lastpackage.source-2016.tar.xz mirror://gentoo/texlive-module-lastpage.source-2016.tar.xz mirror://gentoo/texlive-module-latex-tds.source-2016.tar.xz mirror://gentoo/texlive-module-latexdemo.source-2016.tar.xz mirror://gentoo/texlive-module-latexgit.source-2016.tar.xz mirror://gentoo/texlive-module-layouts.source-2016.tar.xz mirror://gentoo/texlive-module-lcd.source-2016.tar.xz mirror://gentoo/texlive-module-lcg.source-2016.tar.xz mirror://gentoo/texlive-module-leading.source-2016.tar.xz mirror://gentoo/texlive-module-leftidx.source-2016.tar.xz mirror://gentoo/texlive-module-lengthconvert.source-2016.tar.xz mirror://gentoo/texlive-module-lettrine.source-2016.tar.xz mirror://gentoo/texlive-module-lhelp.source-2016.tar.xz mirror://gentoo/texlive-module-libgreek.source-2016.tar.xz mirror://gentoo/texlive-module-limap.source-2016.tar.xz mirror://gentoo/texlive-module-linegoal.source-2016.tar.xz mirror://gentoo/texlive-module-lipsum.source-2016.tar.xz mirror://gentoo/texlive-module-listlbls.source-2016.tar.xz mirror://gentoo/texlive-module-listliketab.source-2016.tar.xz mirror://gentoo/texlive-module-listofsymbols.source-2016.tar.xz mirror://gentoo/texlive-module-lmake.source-2016.tar.xz mirror://gentoo/texlive-module-locality.source-2016.tar.xz mirror://gentoo/texlive-module-localloc.source-2016.tar.xz mirror://gentoo/texlive-module-logbox.source-2016.tar.xz mirror://gentoo/texlive-module-logpap.source-2016.tar.xz mirror://gentoo/texlive-module-longfigure.source-2016.tar.xz mirror://gentoo/texlive-module-longnamefilelist.source-2016.tar.xz mirror://gentoo/texlive-module-lstaddons.source-2016.tar.xz mirror://gentoo/texlive-module-ltxindex.source-2016.tar.xz mirror://gentoo/texlive-module-ltxnew.source-2016.tar.xz mirror://gentoo/texlive-module-macroswap.source-2016.tar.xz mirror://gentoo/texlive-module-mailing.source-2016.tar.xz mirror://gentoo/texlive-module-mailmerge.source-2016.tar.xz mirror://gentoo/texlive-module-makebase.source-2016.tar.xz mirror://gentoo/texlive-module-makebox.source-2016.tar.xz mirror://gentoo/texlive-module-makecell.source-2016.tar.xz mirror://gentoo/texlive-module-makecmds.source-2016.tar.xz mirror://gentoo/texlive-module-makedtx.source-2016.tar.xz mirror://gentoo/texlive-module-mandi.source-2016.tar.xz mirror://gentoo/texlive-module-manfnt.source-2016.tar.xz mirror://gentoo/texlive-module-manuscript.source-2016.tar.xz mirror://gentoo/texlive-module-marginfix.source-2016.tar.xz mirror://gentoo/texlive-module-marginnote.source-2016.tar.xz mirror://gentoo/texlive-module-markdown.source-2016.tar.xz mirror://gentoo/texlive-module-mathastext.source-2016.tar.xz mirror://gentoo/texlive-module-mathexam.source-2016.tar.xz mirror://gentoo/texlive-module-mcaption.source-2016.tar.xz mirror://gentoo/texlive-module-mcite.source-2016.tar.xz mirror://gentoo/texlive-module-mdframed.source-2016.tar.xz mirror://gentoo/texlive-module-media9.source-2016.tar.xz mirror://gentoo/texlive-module-meetingmins.source-2016.tar.xz mirror://gentoo/texlive-module-memory.source-2016.tar.xz mirror://gentoo/texlive-module-menu.source-2016.tar.xz mirror://gentoo/texlive-module-menukeys.source-2016.tar.xz mirror://gentoo/texlive-module-method.source-2016.tar.xz mirror://gentoo/texlive-module-metre.source-2016.tar.xz mirror://gentoo/texlive-module-mfirstuc.source-2016.tar.xz mirror://gentoo/texlive-module-mftinc.source-2016.tar.xz mirror://gentoo/texlive-module-minibox.source-2016.tar.xz mirror://gentoo/texlive-module-minifp.source-2016.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.source-2016.tar.xz mirror://gentoo/texlive-module-minted.source-2016.tar.xz mirror://gentoo/texlive-module-minutes.source-2016.tar.xz mirror://gentoo/texlive-module-mlist.source-2016.tar.xz mirror://gentoo/texlive-module-mnotes.source-2016.tar.xz mirror://gentoo/texlive-module-moderntimeline.source-2016.tar.xz mirror://gentoo/texlive-module-modref.source-2016.tar.xz mirror://gentoo/texlive-module-modroman.source-2016.tar.xz mirror://gentoo/texlive-module-monofill.source-2016.tar.xz mirror://gentoo/texlive-module-moodle.source-2016.tar.xz mirror://gentoo/texlive-module-morefloats.source-2016.tar.xz mirror://gentoo/texlive-module-morehype.source-2016.tar.xz mirror://gentoo/texlive-module-moresize.source-2016.tar.xz mirror://gentoo/texlive-module-moreverb.source-2016.tar.xz mirror://gentoo/texlive-module-morewrites.source-2016.tar.xz mirror://gentoo/texlive-module-mparhack.source-2016.tar.xz mirror://gentoo/texlive-module-mpostinl.source-2016.tar.xz mirror://gentoo/texlive-module-msg.source-2016.tar.xz mirror://gentoo/texlive-module-mtgreek.source-2016.tar.xz mirror://gentoo/texlive-module-multiaudience.source-2016.tar.xz mirror://gentoo/texlive-module-multibbl.source-2016.tar.xz mirror://gentoo/texlive-module-multicap.source-2016.tar.xz mirror://gentoo/texlive-module-multidef.source-2016.tar.xz mirror://gentoo/texlive-module-multienv.source-2016.tar.xz mirror://gentoo/texlive-module-multiexpand.source-2016.tar.xz mirror://gentoo/texlive-module-multirow.source-2016.tar.xz mirror://gentoo/texlive-module-mversion.source-2016.tar.xz mirror://gentoo/texlive-module-mwe.source-2016.tar.xz mirror://gentoo/texlive-module-mycv.source-2016.tar.xz mirror://gentoo/texlive-module-mylatexformat.source-2016.tar.xz mirror://gentoo/texlive-module-nag.source-2016.tar.xz mirror://gentoo/texlive-module-nameauth.source-2016.tar.xz mirror://gentoo/texlive-module-namespc.source-2016.tar.xz mirror://gentoo/texlive-module-ncctools.source-2016.tar.xz mirror://gentoo/texlive-module-needspace.source-2016.tar.xz mirror://gentoo/texlive-module-newfile.source-2016.tar.xz mirror://gentoo/texlive-module-newlfm.source-2016.tar.xz mirror://gentoo/texlive-module-newspaper.source-2016.tar.xz mirror://gentoo/texlive-module-newunicodechar.source-2016.tar.xz mirror://gentoo/texlive-module-newvbtm.source-2016.tar.xz mirror://gentoo/texlive-module-newverbs.source-2016.tar.xz mirror://gentoo/texlive-module-nicefilelist.source-2016.tar.xz mirror://gentoo/texlive-module-niceframe.source-2016.tar.xz mirror://gentoo/texlive-module-nicetext.source-2016.tar.xz mirror://gentoo/texlive-module-noitcrul.source-2016.tar.xz mirror://gentoo/texlive-module-nomencl.source-2016.tar.xz mirror://gentoo/texlive-module-nomentbl.source-2016.tar.xz mirror://gentoo/texlive-module-nonfloat.source-2016.tar.xz mirror://gentoo/texlive-module-nonumonpart.source-2016.tar.xz mirror://gentoo/texlive-module-normalcolor.source-2016.tar.xz mirror://gentoo/texlive-module-notes.source-2016.tar.xz mirror://gentoo/texlive-module-notespages.source-2016.tar.xz mirror://gentoo/texlive-module-nowidow.source-2016.tar.xz mirror://gentoo/texlive-module-ntheorem.source-2016.tar.xz mirror://gentoo/texlive-module-numprint.source-2016.tar.xz mirror://gentoo/texlive-module-ocgx.source-2016.tar.xz mirror://gentoo/texlive-module-octavo.source-2016.tar.xz mirror://gentoo/texlive-module-oldstyle.source-2016.tar.xz mirror://gentoo/texlive-module-onlyamsmath.source-2016.tar.xz mirror://gentoo/texlive-module-opcit.source-2016.tar.xz mirror://gentoo/texlive-module-pagecolor.source-2016.tar.xz mirror://gentoo/texlive-module-pagecont.source-2016.tar.xz mirror://gentoo/texlive-module-pagenote.source-2016.tar.xz mirror://gentoo/texlive-module-pageslts.source-2016.tar.xz mirror://gentoo/texlive-module-paper.source-2016.tar.xz mirror://gentoo/texlive-module-papercdcase.source-2016.tar.xz mirror://gentoo/texlive-module-papermas.source-2016.tar.xz mirror://gentoo/texlive-module-papertex.source-2016.tar.xz mirror://gentoo/texlive-module-paracol.source-2016.tar.xz mirror://gentoo/texlive-module-paralist.source-2016.tar.xz mirror://gentoo/texlive-module-paresse.source-2016.tar.xz mirror://gentoo/texlive-module-parselines.source-2016.tar.xz mirror://gentoo/texlive-module-patch.source-2016.tar.xz mirror://gentoo/texlive-module-patchcmd.source-2016.tar.xz mirror://gentoo/texlive-module-pauldoc.source-2016.tar.xz mirror://gentoo/texlive-module-pawpict.source-2016.tar.xz mirror://gentoo/texlive-module-pbox.source-2016.tar.xz mirror://gentoo/texlive-module-pbsheet.source-2016.tar.xz mirror://gentoo/texlive-module-pdf14.source-2016.tar.xz mirror://gentoo/texlive-module-pdfcprot.source-2016.tar.xz mirror://gentoo/texlive-module-pdfx.source-2016.tar.xz mirror://gentoo/texlive-module-perltex.source-2016.tar.xz mirror://gentoo/texlive-module-permute.source-2016.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.source-2016.tar.xz mirror://gentoo/texlive-module-phfnote.source-2016.tar.xz mirror://gentoo/texlive-module-phfparen.source-2016.tar.xz mirror://gentoo/texlive-module-phfqit.source-2016.tar.xz mirror://gentoo/texlive-module-phfquotetext.source-2016.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.source-2016.tar.xz mirror://gentoo/texlive-module-phfthm.source-2016.tar.xz mirror://gentoo/texlive-module-photo.source-2016.tar.xz mirror://gentoo/texlive-module-plweb.source-2016.tar.xz mirror://gentoo/texlive-module-polynom.source-2016.tar.xz mirror://gentoo/texlive-module-polynomial.source-2016.tar.xz mirror://gentoo/texlive-module-polytable.source-2016.tar.xz mirror://gentoo/texlive-module-ppr-prv.source-2016.tar.xz mirror://gentoo/texlive-module-preprint.source-2016.tar.xz mirror://gentoo/texlive-module-pressrelease.source-2016.tar.xz mirror://gentoo/texlive-module-prettyref.source-2016.tar.xz mirror://gentoo/texlive-module-preview.source-2016.tar.xz mirror://gentoo/texlive-module-probsoln.source-2016.tar.xz mirror://gentoo/texlive-module-proofread.source-2016.tar.xz mirror://gentoo/texlive-module-protocol.source-2016.tar.xz mirror://gentoo/texlive-module-psfragx.source-2016.tar.xz mirror://gentoo/texlive-module-pst-pdf.source-2016.tar.xz mirror://gentoo/texlive-module-pstool.source-2016.tar.xz mirror://gentoo/texlive-module-pxgreeks.source-2016.tar.xz mirror://gentoo/texlive-module-qcm.source-2016.tar.xz mirror://gentoo/texlive-module-qstest.source-2016.tar.xz mirror://gentoo/texlive-module-qsymbols.source-2016.tar.xz mirror://gentoo/texlive-module-quotchap.source-2016.tar.xz mirror://gentoo/texlive-module-quoting.source-2016.tar.xz mirror://gentoo/texlive-module-quotmark.source-2016.tar.xz mirror://gentoo/texlive-module-ran_toks.source-2016.tar.xz mirror://gentoo/texlive-module-rccol.source-2016.tar.xz mirror://gentoo/texlive-module-rcs-multi.source-2016.tar.xz mirror://gentoo/texlive-module-rcsinfo.source-2016.tar.xz mirror://gentoo/texlive-module-realboxes.source-2016.tar.xz mirror://gentoo/texlive-module-recipecard.source-2016.tar.xz mirror://gentoo/texlive-module-reflectgraphics.source-2016.tar.xz mirror://gentoo/texlive-module-refman.source-2016.tar.xz mirror://gentoo/texlive-module-refstyle.source-2016.tar.xz mirror://gentoo/texlive-module-regcount.source-2016.tar.xz mirror://gentoo/texlive-module-regexpatch.source-2016.tar.xz mirror://gentoo/texlive-module-register.source-2016.tar.xz mirror://gentoo/texlive-module-regstats.source-2016.tar.xz mirror://gentoo/texlive-module-relenc.source-2016.tar.xz mirror://gentoo/texlive-module-repltext.source-2016.tar.xz mirror://gentoo/texlive-module-rjlparshap.source-2016.tar.xz mirror://gentoo/texlive-module-robustcommand.source-2016.tar.xz mirror://gentoo/texlive-module-romanbar.source-2016.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.source-2016.tar.xz mirror://gentoo/texlive-module-romannum.source-2016.tar.xz mirror://gentoo/texlive-module-rotfloat.source-2016.tar.xz mirror://gentoo/texlive-module-rtkinenc.source-2016.tar.xz mirror://gentoo/texlive-module-rulercompass.source-2016.tar.xz mirror://gentoo/texlive-module-sauerj.source-2016.tar.xz mirror://gentoo/texlive-module-savefnmark.source-2016.tar.xz mirror://gentoo/texlive-module-savetrees.source-2016.tar.xz mirror://gentoo/texlive-module-scale.source-2016.tar.xz mirror://gentoo/texlive-module-scalebar.source-2016.tar.xz mirror://gentoo/texlive-module-sectsty.source-2016.tar.xz mirror://gentoo/texlive-module-seealso.source-2016.tar.xz mirror://gentoo/texlive-module-semantic.source-2016.tar.xz mirror://gentoo/texlive-module-semioneside.source-2016.tar.xz mirror://gentoo/texlive-module-semproc.source-2016.tar.xz mirror://gentoo/texlive-module-seqsplit.source-2016.tar.xz mirror://gentoo/texlive-module-sf298.source-2016.tar.xz mirror://gentoo/texlive-module-sffms.source-2016.tar.xz mirror://gentoo/texlive-module-shdoc.source-2016.tar.xz mirror://gentoo/texlive-module-shorttoc.source-2016.tar.xz mirror://gentoo/texlive-module-show2e.source-2016.tar.xz mirror://gentoo/texlive-module-showcharinbox.source-2016.tar.xz mirror://gentoo/texlive-module-showexpl.source-2016.tar.xz mirror://gentoo/texlive-module-showlabels.source-2016.tar.xz mirror://gentoo/texlive-module-sidecap.source-2016.tar.xz mirror://gentoo/texlive-module-sidenotes.source-2016.tar.xz mirror://gentoo/texlive-module-silence.source-2016.tar.xz mirror://gentoo/texlive-module-simplecd.source-2016.tar.xz mirror://gentoo/texlive-module-simplecv.source-2016.tar.xz mirror://gentoo/texlive-module-sitem.source-2016.tar.xz mirror://gentoo/texlive-module-skb.source-2016.tar.xz mirror://gentoo/texlive-module-skdoc.source-2016.tar.xz mirror://gentoo/texlive-module-skrapport.source-2016.tar.xz mirror://gentoo/texlive-module-slantsc.source-2016.tar.xz mirror://gentoo/texlive-module-snapshot.source-2016.tar.xz mirror://gentoo/texlive-module-soul.source-2016.tar.xz mirror://gentoo/texlive-module-splitindex.source-2016.tar.xz mirror://gentoo/texlive-module-spot.source-2016.tar.xz mirror://gentoo/texlive-module-spverbatim.source-2016.tar.xz mirror://gentoo/texlive-module-srcltx.source-2016.tar.xz mirror://gentoo/texlive-module-sseq.source-2016.tar.xz mirror://gentoo/texlive-module-stack.source-2016.tar.xz mirror://gentoo/texlive-module-standalone.source-2016.tar.xz mirror://gentoo/texlive-module-statistik.source-2016.tar.xz mirror://gentoo/texlive-module-stdclsdv.source-2016.tar.xz mirror://gentoo/texlive-module-stdpage.source-2016.tar.xz mirror://gentoo/texlive-module-stex.source-2016.tar.xz mirror://gentoo/texlive-module-storebox.source-2016.tar.xz mirror://gentoo/texlive-module-stringstrings.source-2016.tar.xz mirror://gentoo/texlive-module-sttools.source-2016.tar.xz mirror://gentoo/texlive-module-subdepth.source-2016.tar.xz mirror://gentoo/texlive-module-subeqn.source-2016.tar.xz mirror://gentoo/texlive-module-subeqnarray.source-2016.tar.xz mirror://gentoo/texlive-module-subfigure.source-2016.tar.xz mirror://gentoo/texlive-module-subfiles.source-2016.tar.xz mirror://gentoo/texlive-module-subfloat.source-2016.tar.xz mirror://gentoo/texlive-module-supertabular.source-2016.tar.xz mirror://gentoo/texlive-module-svg.source-2016.tar.xz mirror://gentoo/texlive-module-svn.source-2016.tar.xz mirror://gentoo/texlive-module-svn-multi.source-2016.tar.xz mirror://gentoo/texlive-module-svn-prov.source-2016.tar.xz mirror://gentoo/texlive-module-syntrace.source-2016.tar.xz mirror://gentoo/texlive-module-synttree.source-2016.tar.xz mirror://gentoo/texlive-module-tabfigures.source-2016.tar.xz mirror://gentoo/texlive-module-tablefootnote.source-2016.tar.xz mirror://gentoo/texlive-module-tableof.source-2016.tar.xz mirror://gentoo/texlive-module-tablestyles.source-2016.tar.xz mirror://gentoo/texlive-module-tablists.source-2016.tar.xz mirror://gentoo/texlive-module-tabu.source-2016.tar.xz mirror://gentoo/texlive-module-tabularborder.source-2016.tar.xz mirror://gentoo/texlive-module-tabularew.source-2016.tar.xz mirror://gentoo/texlive-module-tabulary.source-2016.tar.xz mirror://gentoo/texlive-module-talk.source-2016.tar.xz mirror://gentoo/texlive-module-tcldoc.source-2016.tar.xz mirror://gentoo/texlive-module-ted.source-2016.tar.xz mirror://gentoo/texlive-module-templatetools.source-2016.tar.xz mirror://gentoo/texlive-module-termcal.source-2016.tar.xz mirror://gentoo/texlive-module-termlist.source-2016.tar.xz mirror://gentoo/texlive-module-testhyphens.source-2016.tar.xz mirror://gentoo/texlive-module-testidx.source-2016.tar.xz mirror://gentoo/texlive-module-tex-label.source-2016.tar.xz mirror://gentoo/texlive-module-texmate.source-2016.tar.xz mirror://gentoo/texlive-module-texments.source-2016.tar.xz mirror://gentoo/texlive-module-texpower.source-2016.tar.xz mirror://gentoo/texlive-module-texshade.source-2016.tar.xz mirror://gentoo/texlive-module-texvc.source-2016.tar.xz mirror://gentoo/texlive-module-textfit.source-2016.tar.xz mirror://gentoo/texlive-module-textgreek.source-2016.tar.xz mirror://gentoo/texlive-module-textmerg.source-2016.tar.xz mirror://gentoo/texlive-module-textpos.source-2016.tar.xz mirror://gentoo/texlive-module-thmtools.source-2016.tar.xz mirror://gentoo/texlive-module-threadcol.source-2016.tar.xz mirror://gentoo/texlive-module-thumb.source-2016.tar.xz mirror://gentoo/texlive-module-thumbs.source-2016.tar.xz mirror://gentoo/texlive-module-titling.source-2016.tar.xz mirror://gentoo/texlive-module-tocbibind.source-2016.tar.xz mirror://gentoo/texlive-module-tocdata.source-2016.tar.xz mirror://gentoo/texlive-module-tocloft.source-2016.tar.xz mirror://gentoo/texlive-module-tocvsec2.source-2016.tar.xz mirror://gentoo/texlive-module-todo.source-2016.tar.xz mirror://gentoo/texlive-module-todonotes.source-2016.tar.xz mirror://gentoo/texlive-module-toolbox.source-2016.tar.xz mirror://gentoo/texlive-module-totcount.source-2016.tar.xz mirror://gentoo/texlive-module-totpages.source-2016.tar.xz mirror://gentoo/texlive-module-trfsigns.source-2016.tar.xz mirror://gentoo/texlive-module-trimspaces.source-2016.tar.xz mirror://gentoo/texlive-module-trivfloat.source-2016.tar.xz mirror://gentoo/texlive-module-trsym.source-2016.tar.xz mirror://gentoo/texlive-module-tucv.source-2016.tar.xz mirror://gentoo/texlive-module-twoup.source-2016.tar.xz mirror://gentoo/texlive-module-txgreeks.source-2016.tar.xz mirror://gentoo/texlive-module-type1cm.source-2016.tar.xz mirror://gentoo/texlive-module-typed-checklist.source-2016.tar.xz mirror://gentoo/texlive-module-typeface.source-2016.tar.xz mirror://gentoo/texlive-module-typogrid.source-2016.tar.xz mirror://gentoo/texlive-module-umoline.source-2016.tar.xz mirror://gentoo/texlive-module-underlin.source-2016.tar.xz mirror://gentoo/texlive-module-undolabl.source-2016.tar.xz mirror://gentoo/texlive-module-units.source-2016.tar.xz mirror://gentoo/texlive-module-unravel.source-2016.tar.xz mirror://gentoo/texlive-module-upquote.source-2016.tar.xz mirror://gentoo/texlive-module-uri.source-2016.tar.xz mirror://gentoo/texlive-module-ushort.source-2016.tar.xz mirror://gentoo/texlive-module-varindex.source-2016.tar.xz mirror://gentoo/texlive-module-versonotes.source-2016.tar.xz mirror://gentoo/texlive-module-vertbars.source-2016.tar.xz mirror://gentoo/texlive-module-vgrid.source-2016.tar.xz mirror://gentoo/texlive-module-vmargin.source-2016.tar.xz mirror://gentoo/texlive-module-volumes.source-2016.tar.xz mirror://gentoo/texlive-module-vwcol.source-2016.tar.xz mirror://gentoo/texlive-module-warpcol.source-2016.tar.xz mirror://gentoo/texlive-module-was.source-2016.tar.xz mirror://gentoo/texlive-module-widetable.source-2016.tar.xz mirror://gentoo/texlive-module-wordlike.source-2016.tar.xz mirror://gentoo/texlive-module-xargs.source-2016.tar.xz mirror://gentoo/texlive-module-xcolor-material.source-2016.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.source-2016.tar.xz mirror://gentoo/texlive-module-xdoc.source-2016.tar.xz mirror://gentoo/texlive-module-xellipsis.source-2016.tar.xz mirror://gentoo/texlive-module-xfor.source-2016.tar.xz mirror://gentoo/texlive-module-xint.source-2016.tar.xz mirror://gentoo/texlive-module-xmpincl.source-2016.tar.xz mirror://gentoo/texlive-module-xpatch.source-2016.tar.xz mirror://gentoo/texlive-module-xpeek.source-2016.tar.xz mirror://gentoo/texlive-module-xpunctuate.source-2016.tar.xz mirror://gentoo/texlive-module-xsavebox.source-2016.tar.xz mirror://gentoo/texlive-module-xtab.source-2016.tar.xz mirror://gentoo/texlive-module-yafoot.source-2016.tar.xz mirror://gentoo/texlive-module-yaletter.source-2016.tar.xz mirror://gentoo/texlive-module-yagusylo.source-2016.tar.xz mirror://gentoo/texlive-module-ydoc.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=88ab92227f9d16f92125f01438bcda16
+_md5_=23ba868c312c88a0554220ee08346e76
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2016 b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2016
index ad6cc9b17875..d0029f02e8a3 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX recommended packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2016 !dev-tex/xkeyval !dev-tex/memoir !dev-tex/listings !<dev-texlive/texlive-latexextra-2011 !=app-text/texlive-core-2007* !<dev-texlive/texlive-xetex-2016 !dev-texlive/texlive-latex3 !<dev-texlive/texlive-humanities-2014 !dev-texlive/texlive-mathextra >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-anysize-2016.tar.xz mirror://gentoo/texlive-module-booktabs-2016.tar.xz mirror://gentoo/texlive-module-breqn-2016.tar.xz mirror://gentoo/texlive-module-caption-2016.tar.xz mirror://gentoo/texlive-module-cite-2016.tar.xz mirror://gentoo/texlive-module-cmap-2016.tar.xz mirror://gentoo/texlive-module-crop-2016.tar.xz mirror://gentoo/texlive-module-ctable-2016.tar.xz mirror://gentoo/texlive-module-eso-pic-2016.tar.xz mirror://gentoo/texlive-module-euenc-2016.tar.xz mirror://gentoo/texlive-module-euler-2016.tar.xz mirror://gentoo/texlive-module-extsizes-2016.tar.xz mirror://gentoo/texlive-module-fancybox-2016.tar.xz mirror://gentoo/texlive-module-fancyref-2016.tar.xz mirror://gentoo/texlive-module-fancyvrb-2016.tar.xz mirror://gentoo/texlive-module-float-2016.tar.xz mirror://gentoo/texlive-module-fontspec-2016.tar.xz mirror://gentoo/texlive-module-fp-2016.tar.xz mirror://gentoo/texlive-module-index-2016.tar.xz mirror://gentoo/texlive-module-jknapltx-2016.tar.xz mirror://gentoo/texlive-module-koma-script-2016.tar.xz mirror://gentoo/texlive-module-l3experimental-2016.tar.xz mirror://gentoo/texlive-module-l3kernel-2016.tar.xz mirror://gentoo/texlive-module-l3packages-2016.tar.xz mirror://gentoo/texlive-module-lineno-2016.tar.xz mirror://gentoo/texlive-module-listings-2016.tar.xz mirror://gentoo/texlive-module-mathspec-2016.tar.xz mirror://gentoo/texlive-module-mathtools-2016.tar.xz mirror://gentoo/texlive-module-mdwtools-2016.tar.xz mirror://gentoo/texlive-module-memoir-2016.tar.xz mirror://gentoo/texlive-module-metalogo-2016.tar.xz mirror://gentoo/texlive-module-microtype-2016.tar.xz mirror://gentoo/texlive-module-ms-2016.tar.xz mirror://gentoo/texlive-module-ntgclass-2016.tar.xz mirror://gentoo/texlive-module-parskip-2016.tar.xz mirror://gentoo/texlive-module-pdfpages-2016.tar.xz mirror://gentoo/texlive-module-polyglossia-2016.tar.xz mirror://gentoo/texlive-module-powerdot-2016.tar.xz mirror://gentoo/texlive-module-psfrag-2016.tar.xz mirror://gentoo/texlive-module-rcs-2016.tar.xz mirror://gentoo/texlive-module-sansmath-2016.tar.xz mirror://gentoo/texlive-module-section-2016.tar.xz mirror://gentoo/texlive-module-seminar-2016.tar.xz mirror://gentoo/texlive-module-sepnum-2016.tar.xz mirror://gentoo/texlive-module-setspace-2016.tar.xz mirror://gentoo/texlive-module-subfig-2016.tar.xz mirror://gentoo/texlive-module-textcase-2016.tar.xz mirror://gentoo/texlive-module-thumbpdf-2016.tar.xz mirror://gentoo/texlive-module-typehtml-2016.tar.xz mirror://gentoo/texlive-module-underscore-2016.tar.xz mirror://gentoo/texlive-module-unicode-math-2016.tar.xz mirror://gentoo/texlive-module-xkeyval-2016.tar.xz mirror://gentoo/texlive-module-xltxtra-2016.tar.xz mirror://gentoo/texlive-module-xunicode-2016.tar.xz mirror://gentoo/texlive-module-collection-latexrecommended-2016.tar.xz doc? ( mirror://gentoo/texlive-module-anysize.doc-2016.tar.xz mirror://gentoo/texlive-module-booktabs.doc-2016.tar.xz mirror://gentoo/texlive-module-breqn.doc-2016.tar.xz mirror://gentoo/texlive-module-caption.doc-2016.tar.xz mirror://gentoo/texlive-module-cite.doc-2016.tar.xz mirror://gentoo/texlive-module-cmap.doc-2016.tar.xz mirror://gentoo/texlive-module-crop.doc-2016.tar.xz mirror://gentoo/texlive-module-ctable.doc-2016.tar.xz mirror://gentoo/texlive-module-eso-pic.doc-2016.tar.xz mirror://gentoo/texlive-module-euenc.doc-2016.tar.xz mirror://gentoo/texlive-module-euler.doc-2016.tar.xz mirror://gentoo/texlive-module-extsizes.doc-2016.tar.xz mirror://gentoo/texlive-module-fancybox.doc-2016.tar.xz mirror://gentoo/texlive-module-fancyref.doc-2016.tar.xz mirror://gentoo/texlive-module-fancyvrb.doc-2016.tar.xz mirror://gentoo/texlive-module-float.doc-2016.tar.xz mirror://gentoo/texlive-module-fontspec.doc-2016.tar.xz mirror://gentoo/texlive-module-fp.doc-2016.tar.xz mirror://gentoo/texlive-module-index.doc-2016.tar.xz mirror://gentoo/texlive-module-jknapltx.doc-2016.tar.xz mirror://gentoo/texlive-module-l3experimental.doc-2016.tar.xz mirror://gentoo/texlive-module-l3kernel.doc-2016.tar.xz mirror://gentoo/texlive-module-l3packages.doc-2016.tar.xz mirror://gentoo/texlive-module-lineno.doc-2016.tar.xz mirror://gentoo/texlive-module-listings.doc-2016.tar.xz mirror://gentoo/texlive-module-mathspec.doc-2016.tar.xz mirror://gentoo/texlive-module-mathtools.doc-2016.tar.xz mirror://gentoo/texlive-module-mdwtools.doc-2016.tar.xz mirror://gentoo/texlive-module-memoir.doc-2016.tar.xz mirror://gentoo/texlive-module-metalogo.doc-2016.tar.xz mirror://gentoo/texlive-module-microtype.doc-2016.tar.xz mirror://gentoo/texlive-module-ms.doc-2016.tar.xz mirror://gentoo/texlive-module-ntgclass.doc-2016.tar.xz mirror://gentoo/texlive-module-parskip.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfpages.doc-2016.tar.xz mirror://gentoo/texlive-module-polyglossia.doc-2016.tar.xz mirror://gentoo/texlive-module-powerdot.doc-2016.tar.xz mirror://gentoo/texlive-module-psfrag.doc-2016.tar.xz mirror://gentoo/texlive-module-rcs.doc-2016.tar.xz mirror://gentoo/texlive-module-sansmath.doc-2016.tar.xz mirror://gentoo/texlive-module-section.doc-2016.tar.xz mirror://gentoo/texlive-module-seminar.doc-2016.tar.xz mirror://gentoo/texlive-module-sepnum.doc-2016.tar.xz mirror://gentoo/texlive-module-setspace.doc-2016.tar.xz mirror://gentoo/texlive-module-subfig.doc-2016.tar.xz mirror://gentoo/texlive-module-textcase.doc-2016.tar.xz mirror://gentoo/texlive-module-thumbpdf.doc-2016.tar.xz mirror://gentoo/texlive-module-typehtml.doc-2016.tar.xz mirror://gentoo/texlive-module-underscore.doc-2016.tar.xz mirror://gentoo/texlive-module-unicode-math.doc-2016.tar.xz mirror://gentoo/texlive-module-xkeyval.doc-2016.tar.xz mirror://gentoo/texlive-module-xltxtra.doc-2016.tar.xz mirror://gentoo/texlive-module-xunicode.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-booktabs.source-2016.tar.xz mirror://gentoo/texlive-module-breqn.source-2016.tar.xz mirror://gentoo/texlive-module-caption.source-2016.tar.xz mirror://gentoo/texlive-module-crop.source-2016.tar.xz mirror://gentoo/texlive-module-ctable.source-2016.tar.xz mirror://gentoo/texlive-module-eso-pic.source-2016.tar.xz mirror://gentoo/texlive-module-euenc.source-2016.tar.xz mirror://gentoo/texlive-module-euler.source-2016.tar.xz mirror://gentoo/texlive-module-fancyref.source-2016.tar.xz mirror://gentoo/texlive-module-fancyvrb.source-2016.tar.xz mirror://gentoo/texlive-module-float.source-2016.tar.xz mirror://gentoo/texlive-module-fontspec.source-2016.tar.xz mirror://gentoo/texlive-module-index.source-2016.tar.xz mirror://gentoo/texlive-module-l3experimental.source-2016.tar.xz mirror://gentoo/texlive-module-l3kernel.source-2016.tar.xz mirror://gentoo/texlive-module-l3packages.source-2016.tar.xz mirror://gentoo/texlive-module-lineno.source-2016.tar.xz mirror://gentoo/texlive-module-listings.source-2016.tar.xz mirror://gentoo/texlive-module-mathtools.source-2016.tar.xz mirror://gentoo/texlive-module-mdwtools.source-2016.tar.xz mirror://gentoo/texlive-module-memoir.source-2016.tar.xz mirror://gentoo/texlive-module-metalogo.source-2016.tar.xz mirror://gentoo/texlive-module-microtype.source-2016.tar.xz mirror://gentoo/texlive-module-ms.source-2016.tar.xz mirror://gentoo/texlive-module-ntgclass.source-2016.tar.xz mirror://gentoo/texlive-module-pdfpages.source-2016.tar.xz mirror://gentoo/texlive-module-polyglossia.source-2016.tar.xz mirror://gentoo/texlive-module-powerdot.source-2016.tar.xz mirror://gentoo/texlive-module-psfrag.source-2016.tar.xz mirror://gentoo/texlive-module-rcs.source-2016.tar.xz mirror://gentoo/texlive-module-subfig.source-2016.tar.xz mirror://gentoo/texlive-module-textcase.source-2016.tar.xz mirror://gentoo/texlive-module-typehtml.source-2016.tar.xz mirror://gentoo/texlive-module-unicode-math.source-2016.tar.xz mirror://gentoo/texlive-module-xkeyval.source-2016.tar.xz mirror://gentoo/texlive-module-xltxtra.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=298414a18e8d25bef6ecca9b1d027ea5
+_md5_=b4ea1dec3270f7b8d952e03f98de3a17
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2016 b/metadata/md5-cache/dev-texlive/texlive-luatex-2016
index 690ad7a4d060..b65583a504e6 100644
--- a/metadata/md5-cache/dev-texlive/texlive-luatex-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-luatex-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LuaTeX packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 dev-texlive/texlive-xetex >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-checkcites-2016.tar.xz mirror://gentoo/texlive-module-chickenize-2016.tar.xz mirror://gentoo/texlive-module-cloze-2016.tar.xz mirror://gentoo/texlive-module-cstypo-2016.tar.xz mirror://gentoo/texlive-module-ctablestack-2016.tar.xz mirror://gentoo/texlive-module-enigma-2016.tar.xz mirror://gentoo/texlive-module-interpreter-2016.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen-2016.tar.xz mirror://gentoo/texlive-module-lua-visual-debug-2016.tar.xz mirror://gentoo/texlive-module-lua2dox-2016.tar.xz mirror://gentoo/texlive-module-luabibentry-2016.tar.xz mirror://gentoo/texlive-module-luabidi-2016.tar.xz mirror://gentoo/texlive-module-luacode-2016.tar.xz mirror://gentoo/texlive-module-luahyphenrules-2016.tar.xz mirror://gentoo/texlive-module-luaindex-2016.tar.xz mirror://gentoo/texlive-module-luainputenc-2016.tar.xz mirror://gentoo/texlive-module-luaintro-2016.tar.xz mirror://gentoo/texlive-module-lualatex-doc-2016.tar.xz mirror://gentoo/texlive-module-lualatex-math-2016.tar.xz mirror://gentoo/texlive-module-lualibs-2016.tar.xz mirror://gentoo/texlive-module-luamplib-2016.tar.xz mirror://gentoo/texlive-module-luaotfload-2016.tar.xz mirror://gentoo/texlive-module-luasseq-2016.tar.xz mirror://gentoo/texlive-module-luatex85-2016.tar.xz mirror://gentoo/texlive-module-luatexbase-2016.tar.xz mirror://gentoo/texlive-module-luatexko-2016.tar.xz mirror://gentoo/texlive-module-luatextra-2016.tar.xz mirror://gentoo/texlive-module-luatodonotes-2016.tar.xz mirror://gentoo/texlive-module-luaxml-2016.tar.xz mirror://gentoo/texlive-module-nodetree-2016.tar.xz mirror://gentoo/texlive-module-odsfile-2016.tar.xz mirror://gentoo/texlive-module-placeat-2016.tar.xz mirror://gentoo/texlive-module-selnolig-2016.tar.xz mirror://gentoo/texlive-module-showhyphens-2016.tar.xz mirror://gentoo/texlive-module-spelling-2016.tar.xz mirror://gentoo/texlive-module-ucharcat-2016.tar.xz mirror://gentoo/texlive-module-collection-luatex-2016.tar.xz doc? ( mirror://gentoo/texlive-module-checkcites.doc-2016.tar.xz mirror://gentoo/texlive-module-chickenize.doc-2016.tar.xz mirror://gentoo/texlive-module-cloze.doc-2016.tar.xz mirror://gentoo/texlive-module-cstypo.doc-2016.tar.xz mirror://gentoo/texlive-module-ctablestack.doc-2016.tar.xz mirror://gentoo/texlive-module-enigma.doc-2016.tar.xz mirror://gentoo/texlive-module-interpreter.doc-2016.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen.doc-2016.tar.xz mirror://gentoo/texlive-module-lua-visual-debug.doc-2016.tar.xz mirror://gentoo/texlive-module-lua2dox.doc-2016.tar.xz mirror://gentoo/texlive-module-luabibentry.doc-2016.tar.xz mirror://gentoo/texlive-module-luabidi.doc-2016.tar.xz mirror://gentoo/texlive-module-luacode.doc-2016.tar.xz mirror://gentoo/texlive-module-luahyphenrules.doc-2016.tar.xz mirror://gentoo/texlive-module-luaindex.doc-2016.tar.xz mirror://gentoo/texlive-module-luainputenc.doc-2016.tar.xz mirror://gentoo/texlive-module-luaintro.doc-2016.tar.xz mirror://gentoo/texlive-module-lualatex-doc.doc-2016.tar.xz mirror://gentoo/texlive-module-lualatex-math.doc-2016.tar.xz mirror://gentoo/texlive-module-lualibs.doc-2016.tar.xz mirror://gentoo/texlive-module-luamplib.doc-2016.tar.xz mirror://gentoo/texlive-module-luaotfload.doc-2016.tar.xz mirror://gentoo/texlive-module-luasseq.doc-2016.tar.xz mirror://gentoo/texlive-module-luatex85.doc-2016.tar.xz mirror://gentoo/texlive-module-luatexbase.doc-2016.tar.xz mirror://gentoo/texlive-module-luatexko.doc-2016.tar.xz mirror://gentoo/texlive-module-luatextra.doc-2016.tar.xz mirror://gentoo/texlive-module-luatodonotes.doc-2016.tar.xz mirror://gentoo/texlive-module-luaxml.doc-2016.tar.xz mirror://gentoo/texlive-module-nodetree.doc-2016.tar.xz mirror://gentoo/texlive-module-odsfile.doc-2016.tar.xz mirror://gentoo/texlive-module-placeat.doc-2016.tar.xz mirror://gentoo/texlive-module-selnolig.doc-2016.tar.xz mirror://gentoo/texlive-module-showhyphens.doc-2016.tar.xz mirror://gentoo/texlive-module-spelling.doc-2016.tar.xz mirror://gentoo/texlive-module-ucharcat.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-chickenize.source-2016.tar.xz mirror://gentoo/texlive-module-cloze.source-2016.tar.xz mirror://gentoo/texlive-module-ctablestack.source-2016.tar.xz mirror://gentoo/texlive-module-luabibentry.source-2016.tar.xz mirror://gentoo/texlive-module-luacode.source-2016.tar.xz mirror://gentoo/texlive-module-luaindex.source-2016.tar.xz mirror://gentoo/texlive-module-luainputenc.source-2016.tar.xz mirror://gentoo/texlive-module-lualatex-doc.source-2016.tar.xz mirror://gentoo/texlive-module-lualatex-math.source-2016.tar.xz mirror://gentoo/texlive-module-lualibs.source-2016.tar.xz mirror://gentoo/texlive-module-luamplib.source-2016.tar.xz mirror://gentoo/texlive-module-luaotfload.source-2016.tar.xz mirror://gentoo/texlive-module-luasseq.source-2016.tar.xz mirror://gentoo/texlive-module-luatex85.source-2016.tar.xz mirror://gentoo/texlive-module-luatexbase.source-2016.tar.xz mirror://gentoo/texlive-module-luatextra.source-2016.tar.xz mirror://gentoo/texlive-module-luatodonotes.source-2016.tar.xz mirror://gentoo/texlive-module-nodetree.source-2016.tar.xz mirror://gentoo/texlive-module-placeat.source-2016.tar.xz mirror://gentoo/texlive-module-ucharcat.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=b5b7aa849e98e5ba7bf8a5a745566be2
+_md5_=9220fa405e0cada7cfe023511d05b958
diff --git a/metadata/md5-cache/dev-texlive/texlive-mathscience-2016 b/metadata/md5-cache/dev-texlive/texlive-mathscience-2016
index a5e636af08cc..8742b070b864 100644
--- a/metadata/md5-cache/dev-texlive/texlive-mathscience-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-mathscience-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Mathematics and science packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-fontsrecommended-2016 >=dev-texlive/texlive-latex-2016 !<dev-texlive/texlive-latexextra-2016 !dev-tex/SIunits !dev-texlive/texlive-mathextra !dev-texlive/texlive-science dev-texlive/texlive-pstricks >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-12many-2016.tar.xz mirror://gentoo/texlive-module-SIstyle-2016.tar.xz mirror://gentoo/texlive-module-SIunits-2016.tar.xz mirror://gentoo/texlive-module-alg-2016.tar.xz mirror://gentoo/texlive-module-algorithm2e-2016.tar.xz mirror://gentoo/texlive-module-algorithmicx-2016.tar.xz mirror://gentoo/texlive-module-algorithms-2016.tar.xz mirror://gentoo/texlive-module-amstex-2016.tar.xz mirror://gentoo/texlive-module-apxproof-2016.tar.xz mirror://gentoo/texlive-module-autobreak-2016.tar.xz mirror://gentoo/texlive-module-backnaur-2016.tar.xz mirror://gentoo/texlive-module-begriff-2016.tar.xz mirror://gentoo/texlive-module-binomexp-2016.tar.xz mirror://gentoo/texlive-module-biocon-2016.tar.xz mirror://gentoo/texlive-module-bitpattern-2016.tar.xz mirror://gentoo/texlive-module-bohr-2016.tar.xz mirror://gentoo/texlive-module-boldtensors-2016.tar.xz mirror://gentoo/texlive-module-bosisio-2016.tar.xz mirror://gentoo/texlive-module-bpchem-2016.tar.xz mirror://gentoo/texlive-module-bropd-2016.tar.xz mirror://gentoo/texlive-module-bytefield-2016.tar.xz mirror://gentoo/texlive-module-calculation-2016.tar.xz mirror://gentoo/texlive-module-ccfonts-2016.tar.xz mirror://gentoo/texlive-module-chemarrow-2016.tar.xz mirror://gentoo/texlive-module-chemcompounds-2016.tar.xz mirror://gentoo/texlive-module-chemcono-2016.tar.xz mirror://gentoo/texlive-module-chemexec-2016.tar.xz mirror://gentoo/texlive-module-chemformula-2016.tar.xz mirror://gentoo/texlive-module-chemgreek-2016.tar.xz mirror://gentoo/texlive-module-chemmacros-2016.tar.xz mirror://gentoo/texlive-module-chemnum-2016.tar.xz mirror://gentoo/texlive-module-chemschemex-2016.tar.xz mirror://gentoo/texlive-module-chemstyle-2016.tar.xz mirror://gentoo/texlive-module-clrscode-2016.tar.xz mirror://gentoo/texlive-module-clrscode3e-2016.tar.xz mirror://gentoo/texlive-module-commath-2016.tar.xz mirror://gentoo/texlive-module-complexity-2016.tar.xz mirror://gentoo/texlive-module-computational-complexity-2016.tar.xz mirror://gentoo/texlive-module-concmath-2016.tar.xz mirror://gentoo/texlive-module-concrete-2016.tar.xz mirror://gentoo/texlive-module-conteq-2016.tar.xz mirror://gentoo/texlive-module-cryptocode-2016.tar.xz mirror://gentoo/texlive-module-delim-2016.tar.xz mirror://gentoo/texlive-module-delimset-2016.tar.xz mirror://gentoo/texlive-module-delimseasy-2016.tar.xz mirror://gentoo/texlive-module-diffcoeff-2016.tar.xz mirror://gentoo/texlive-module-digiconfigs-2016.tar.xz mirror://gentoo/texlive-module-drawmatrix-2016.tar.xz mirror://gentoo/texlive-module-drawstack-2016.tar.xz mirror://gentoo/texlive-module-dyntree-2016.tar.xz mirror://gentoo/texlive-module-ebproof-2016.tar.xz mirror://gentoo/texlive-module-econometrics-2016.tar.xz mirror://gentoo/texlive-module-eltex-2016.tar.xz mirror://gentoo/texlive-module-emf-2016.tar.xz mirror://gentoo/texlive-module-endiagram-2016.tar.xz mirror://gentoo/texlive-module-engtlc-2016.tar.xz mirror://gentoo/texlive-module-eqnarray-2016.tar.xz mirror://gentoo/texlive-module-extarrows-2016.tar.xz mirror://gentoo/texlive-module-extpfeil-2016.tar.xz mirror://gentoo/texlive-module-faktor-2016.tar.xz mirror://gentoo/texlive-module-fouridx-2016.tar.xz mirror://gentoo/texlive-module-functan-2016.tar.xz mirror://gentoo/texlive-module-galois-2016.tar.xz mirror://gentoo/texlive-module-gastex-2016.tar.xz mirror://gentoo/texlive-module-gene-logic-2016.tar.xz mirror://gentoo/texlive-module-ghsystem-2016.tar.xz mirror://gentoo/texlive-module-grundgesetze-2016.tar.xz mirror://gentoo/texlive-module-gu-2016.tar.xz mirror://gentoo/texlive-module-hep-2016.tar.xz mirror://gentoo/texlive-module-hepnames-2016.tar.xz mirror://gentoo/texlive-module-hepparticles-2016.tar.xz mirror://gentoo/texlive-module-hepthesis-2016.tar.xz mirror://gentoo/texlive-module-hepunits-2016.tar.xz mirror://gentoo/texlive-module-interval-2016.tar.xz mirror://gentoo/texlive-module-ionumbers-2016.tar.xz mirror://gentoo/texlive-module-isomath-2016.tar.xz mirror://gentoo/texlive-module-karnaugh-2016.tar.xz mirror://gentoo/texlive-module-karnaugh-map-2016.tar.xz mirror://gentoo/texlive-module-karnaughmap-2016.tar.xz mirror://gentoo/texlive-module-logicproof-2016.tar.xz mirror://gentoo/texlive-module-lpform-2016.tar.xz mirror://gentoo/texlive-module-lplfitch-2016.tar.xz mirror://gentoo/texlive-module-lstbayes-2016.tar.xz mirror://gentoo/texlive-module-mathcomp-2016.tar.xz mirror://gentoo/texlive-module-mathpartir-2016.tar.xz mirror://gentoo/texlive-module-matlab-prettifier-2016.tar.xz mirror://gentoo/texlive-module-mattens-2016.tar.xz mirror://gentoo/texlive-module-mgltex-2016.tar.xz mirror://gentoo/texlive-module-mhchem-2016.tar.xz mirror://gentoo/texlive-module-mhequ-2016.tar.xz mirror://gentoo/texlive-module-miller-2016.tar.xz mirror://gentoo/texlive-module-multiobjective-2016.tar.xz mirror://gentoo/texlive-module-mychemistry-2016.tar.xz mirror://gentoo/texlive-module-natded-2016.tar.xz mirror://gentoo/texlive-module-nath-2016.tar.xz mirror://gentoo/texlive-module-nuc-2016.tar.xz mirror://gentoo/texlive-module-nucleardata-2016.tar.xz mirror://gentoo/texlive-module-objectz-2016.tar.xz mirror://gentoo/texlive-module-ot-tableau-2016.tar.xz mirror://gentoo/texlive-module-oubraces-2016.tar.xz mirror://gentoo/texlive-module-perfectcut-2016.tar.xz mirror://gentoo/texlive-module-physics-2016.tar.xz mirror://gentoo/texlive-module-prftree-2016.tar.xz mirror://gentoo/texlive-module-proba-2016.tar.xz mirror://gentoo/texlive-module-prooftrees-2016.tar.xz mirror://gentoo/texlive-module-pseudocode-2016.tar.xz mirror://gentoo/texlive-module-pygmentex-2016.tar.xz mirror://gentoo/texlive-module-rec-thy-2016.tar.xz mirror://gentoo/texlive-module-revquantum-2016.tar.xz mirror://gentoo/texlive-module-ribbonproofs-2016.tar.xz mirror://gentoo/texlive-module-rmathbr-2016.tar.xz mirror://gentoo/texlive-module-sasnrdisplay-2016.tar.xz mirror://gentoo/texlive-module-sciposter-2016.tar.xz mirror://gentoo/texlive-module-sclang-prettifier-2016.tar.xz mirror://gentoo/texlive-module-sesamanuel-2016.tar.xz mirror://gentoo/texlive-module-sfg-2016.tar.xz mirror://gentoo/texlive-module-shuffle-2016.tar.xz mirror://gentoo/texlive-module-simpler-wick-2016.tar.xz mirror://gentoo/texlive-module-simplewick-2016.tar.xz mirror://gentoo/texlive-module-siunitx-2016.tar.xz mirror://gentoo/texlive-module-skmath-2016.tar.xz mirror://gentoo/texlive-module-spalign-2016.tar.xz mirror://gentoo/texlive-module-stanli-2016.tar.xz mirror://gentoo/texlive-module-statex-2016.tar.xz mirror://gentoo/texlive-module-statex2-2016.tar.xz mirror://gentoo/texlive-module-steinmetz-2016.tar.xz mirror://gentoo/texlive-module-stmaryrd-2016.tar.xz mirror://gentoo/texlive-module-struktex-2016.tar.xz mirror://gentoo/texlive-module-substances-2016.tar.xz mirror://gentoo/texlive-module-subsupscripts-2016.tar.xz mirror://gentoo/texlive-module-susy-2016.tar.xz mirror://gentoo/texlive-module-syllogism-2016.tar.xz mirror://gentoo/texlive-module-sympytexpackage-2016.tar.xz mirror://gentoo/texlive-module-synproof-2016.tar.xz mirror://gentoo/texlive-module-t-angles-2016.tar.xz mirror://gentoo/texlive-module-tablor-2016.tar.xz mirror://gentoo/texlive-module-tensor-2016.tar.xz mirror://gentoo/texlive-module-tex-ewd-2016.tar.xz mirror://gentoo/texlive-module-textopo-2016.tar.xz mirror://gentoo/texlive-module-thmbox-2016.tar.xz mirror://gentoo/texlive-module-turnstile-2016.tar.xz mirror://gentoo/texlive-module-ulqda-2016.tar.xz mirror://gentoo/texlive-module-unitsdef-2016.tar.xz mirror://gentoo/texlive-module-venn-2016.tar.xz mirror://gentoo/texlive-module-xymtex-2016.tar.xz mirror://gentoo/texlive-module-yhmath-2016.tar.xz mirror://gentoo/texlive-module-youngtab-2016.tar.xz mirror://gentoo/texlive-module-ytableau-2016.tar.xz mirror://gentoo/texlive-module-collection-mathscience-2016.tar.xz doc? ( mirror://gentoo/texlive-module-12many.doc-2016.tar.xz mirror://gentoo/texlive-module-SIstyle.doc-2016.tar.xz mirror://gentoo/texlive-module-SIunits.doc-2016.tar.xz mirror://gentoo/texlive-module-alg.doc-2016.tar.xz mirror://gentoo/texlive-module-algorithm2e.doc-2016.tar.xz mirror://gentoo/texlive-module-algorithmicx.doc-2016.tar.xz mirror://gentoo/texlive-module-algorithms.doc-2016.tar.xz mirror://gentoo/texlive-module-amstex.doc-2016.tar.xz mirror://gentoo/texlive-module-apxproof.doc-2016.tar.xz mirror://gentoo/texlive-module-autobreak.doc-2016.tar.xz mirror://gentoo/texlive-module-backnaur.doc-2016.tar.xz mirror://gentoo/texlive-module-begriff.doc-2016.tar.xz mirror://gentoo/texlive-module-binomexp.doc-2016.tar.xz mirror://gentoo/texlive-module-biocon.doc-2016.tar.xz mirror://gentoo/texlive-module-bitpattern.doc-2016.tar.xz mirror://gentoo/texlive-module-bohr.doc-2016.tar.xz mirror://gentoo/texlive-module-boldtensors.doc-2016.tar.xz mirror://gentoo/texlive-module-bosisio.doc-2016.tar.xz mirror://gentoo/texlive-module-bpchem.doc-2016.tar.xz mirror://gentoo/texlive-module-bropd.doc-2016.tar.xz mirror://gentoo/texlive-module-bytefield.doc-2016.tar.xz mirror://gentoo/texlive-module-calculation.doc-2016.tar.xz mirror://gentoo/texlive-module-ccfonts.doc-2016.tar.xz mirror://gentoo/texlive-module-chemarrow.doc-2016.tar.xz mirror://gentoo/texlive-module-chemcompounds.doc-2016.tar.xz mirror://gentoo/texlive-module-chemcono.doc-2016.tar.xz mirror://gentoo/texlive-module-chemexec.doc-2016.tar.xz mirror://gentoo/texlive-module-chemformula.doc-2016.tar.xz mirror://gentoo/texlive-module-chemgreek.doc-2016.tar.xz mirror://gentoo/texlive-module-chemmacros.doc-2016.tar.xz mirror://gentoo/texlive-module-chemnum.doc-2016.tar.xz mirror://gentoo/texlive-module-chemschemex.doc-2016.tar.xz mirror://gentoo/texlive-module-chemstyle.doc-2016.tar.xz mirror://gentoo/texlive-module-clrscode.doc-2016.tar.xz mirror://gentoo/texlive-module-clrscode3e.doc-2016.tar.xz mirror://gentoo/texlive-module-commath.doc-2016.tar.xz mirror://gentoo/texlive-module-complexity.doc-2016.tar.xz mirror://gentoo/texlive-module-computational-complexity.doc-2016.tar.xz mirror://gentoo/texlive-module-concmath.doc-2016.tar.xz mirror://gentoo/texlive-module-concrete.doc-2016.tar.xz mirror://gentoo/texlive-module-conteq.doc-2016.tar.xz mirror://gentoo/texlive-module-cryptocode.doc-2016.tar.xz mirror://gentoo/texlive-module-delim.doc-2016.tar.xz mirror://gentoo/texlive-module-delimset.doc-2016.tar.xz mirror://gentoo/texlive-module-delimseasy.doc-2016.tar.xz mirror://gentoo/texlive-module-diffcoeff.doc-2016.tar.xz mirror://gentoo/texlive-module-digiconfigs.doc-2016.tar.xz mirror://gentoo/texlive-module-drawmatrix.doc-2016.tar.xz mirror://gentoo/texlive-module-drawstack.doc-2016.tar.xz mirror://gentoo/texlive-module-dyntree.doc-2016.tar.xz mirror://gentoo/texlive-module-ebproof.doc-2016.tar.xz mirror://gentoo/texlive-module-econometrics.doc-2016.tar.xz mirror://gentoo/texlive-module-eltex.doc-2016.tar.xz mirror://gentoo/texlive-module-emf.doc-2016.tar.xz mirror://gentoo/texlive-module-endiagram.doc-2016.tar.xz mirror://gentoo/texlive-module-engtlc.doc-2016.tar.xz mirror://gentoo/texlive-module-eqnarray.doc-2016.tar.xz mirror://gentoo/texlive-module-extarrows.doc-2016.tar.xz mirror://gentoo/texlive-module-extpfeil.doc-2016.tar.xz mirror://gentoo/texlive-module-faktor.doc-2016.tar.xz mirror://gentoo/texlive-module-fouridx.doc-2016.tar.xz mirror://gentoo/texlive-module-functan.doc-2016.tar.xz mirror://gentoo/texlive-module-galois.doc-2016.tar.xz mirror://gentoo/texlive-module-gastex.doc-2016.tar.xz mirror://gentoo/texlive-module-gene-logic.doc-2016.tar.xz mirror://gentoo/texlive-module-ghsystem.doc-2016.tar.xz mirror://gentoo/texlive-module-grundgesetze.doc-2016.tar.xz mirror://gentoo/texlive-module-gu.doc-2016.tar.xz mirror://gentoo/texlive-module-hep.doc-2016.tar.xz mirror://gentoo/texlive-module-hepnames.doc-2016.tar.xz mirror://gentoo/texlive-module-hepparticles.doc-2016.tar.xz mirror://gentoo/texlive-module-hepthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-hepunits.doc-2016.tar.xz mirror://gentoo/texlive-module-interval.doc-2016.tar.xz mirror://gentoo/texlive-module-ionumbers.doc-2016.tar.xz mirror://gentoo/texlive-module-isomath.doc-2016.tar.xz mirror://gentoo/texlive-module-karnaugh.doc-2016.tar.xz mirror://gentoo/texlive-module-karnaugh-map.doc-2016.tar.xz mirror://gentoo/texlive-module-karnaughmap.doc-2016.tar.xz mirror://gentoo/texlive-module-logicproof.doc-2016.tar.xz mirror://gentoo/texlive-module-lpform.doc-2016.tar.xz mirror://gentoo/texlive-module-lplfitch.doc-2016.tar.xz mirror://gentoo/texlive-module-lstbayes.doc-2016.tar.xz mirror://gentoo/texlive-module-mathcomp.doc-2016.tar.xz mirror://gentoo/texlive-module-mathpartir.doc-2016.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.doc-2016.tar.xz mirror://gentoo/texlive-module-mattens.doc-2016.tar.xz mirror://gentoo/texlive-module-mgltex.doc-2016.tar.xz mirror://gentoo/texlive-module-mhchem.doc-2016.tar.xz mirror://gentoo/texlive-module-mhequ.doc-2016.tar.xz mirror://gentoo/texlive-module-miller.doc-2016.tar.xz mirror://gentoo/texlive-module-multiobjective.doc-2016.tar.xz mirror://gentoo/texlive-module-mychemistry.doc-2016.tar.xz mirror://gentoo/texlive-module-natded.doc-2016.tar.xz mirror://gentoo/texlive-module-nath.doc-2016.tar.xz mirror://gentoo/texlive-module-nuc.doc-2016.tar.xz mirror://gentoo/texlive-module-nucleardata.doc-2016.tar.xz mirror://gentoo/texlive-module-objectz.doc-2016.tar.xz mirror://gentoo/texlive-module-ot-tableau.doc-2016.tar.xz mirror://gentoo/texlive-module-oubraces.doc-2016.tar.xz mirror://gentoo/texlive-module-perfectcut.doc-2016.tar.xz mirror://gentoo/texlive-module-physics.doc-2016.tar.xz mirror://gentoo/texlive-module-prftree.doc-2016.tar.xz mirror://gentoo/texlive-module-proba.doc-2016.tar.xz mirror://gentoo/texlive-module-prooftrees.doc-2016.tar.xz mirror://gentoo/texlive-module-pseudocode.doc-2016.tar.xz mirror://gentoo/texlive-module-pygmentex.doc-2016.tar.xz mirror://gentoo/texlive-module-rec-thy.doc-2016.tar.xz mirror://gentoo/texlive-module-revquantum.doc-2016.tar.xz mirror://gentoo/texlive-module-ribbonproofs.doc-2016.tar.xz mirror://gentoo/texlive-module-rmathbr.doc-2016.tar.xz mirror://gentoo/texlive-module-sasnrdisplay.doc-2016.tar.xz mirror://gentoo/texlive-module-sciposter.doc-2016.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.doc-2016.tar.xz mirror://gentoo/texlive-module-sesamanuel.doc-2016.tar.xz mirror://gentoo/texlive-module-sfg.doc-2016.tar.xz mirror://gentoo/texlive-module-shuffle.doc-2016.tar.xz mirror://gentoo/texlive-module-simpler-wick.doc-2016.tar.xz mirror://gentoo/texlive-module-simplewick.doc-2016.tar.xz mirror://gentoo/texlive-module-siunitx.doc-2016.tar.xz mirror://gentoo/texlive-module-skmath.doc-2016.tar.xz mirror://gentoo/texlive-module-spalign.doc-2016.tar.xz mirror://gentoo/texlive-module-stanli.doc-2016.tar.xz mirror://gentoo/texlive-module-statex.doc-2016.tar.xz mirror://gentoo/texlive-module-statex2.doc-2016.tar.xz mirror://gentoo/texlive-module-steinmetz.doc-2016.tar.xz mirror://gentoo/texlive-module-stmaryrd.doc-2016.tar.xz mirror://gentoo/texlive-module-struktex.doc-2016.tar.xz mirror://gentoo/texlive-module-substances.doc-2016.tar.xz mirror://gentoo/texlive-module-subsupscripts.doc-2016.tar.xz mirror://gentoo/texlive-module-susy.doc-2016.tar.xz mirror://gentoo/texlive-module-syllogism.doc-2016.tar.xz mirror://gentoo/texlive-module-sympytexpackage.doc-2016.tar.xz mirror://gentoo/texlive-module-synproof.doc-2016.tar.xz mirror://gentoo/texlive-module-t-angles.doc-2016.tar.xz mirror://gentoo/texlive-module-tablor.doc-2016.tar.xz mirror://gentoo/texlive-module-tensor.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-ewd.doc-2016.tar.xz mirror://gentoo/texlive-module-textopo.doc-2016.tar.xz mirror://gentoo/texlive-module-thmbox.doc-2016.tar.xz mirror://gentoo/texlive-module-turnstile.doc-2016.tar.xz mirror://gentoo/texlive-module-ulqda.doc-2016.tar.xz mirror://gentoo/texlive-module-unitsdef.doc-2016.tar.xz mirror://gentoo/texlive-module-venn.doc-2016.tar.xz mirror://gentoo/texlive-module-xymtex.doc-2016.tar.xz mirror://gentoo/texlive-module-yhmath.doc-2016.tar.xz mirror://gentoo/texlive-module-youngtab.doc-2016.tar.xz mirror://gentoo/texlive-module-ytableau.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-12many.source-2016.tar.xz mirror://gentoo/texlive-module-SIstyle.source-2016.tar.xz mirror://gentoo/texlive-module-SIunits.source-2016.tar.xz mirror://gentoo/texlive-module-alg.source-2016.tar.xz mirror://gentoo/texlive-module-algorithms.source-2016.tar.xz mirror://gentoo/texlive-module-apxproof.source-2016.tar.xz mirror://gentoo/texlive-module-autobreak.source-2016.tar.xz mirror://gentoo/texlive-module-backnaur.source-2016.tar.xz mirror://gentoo/texlive-module-binomexp.source-2016.tar.xz mirror://gentoo/texlive-module-bitpattern.source-2016.tar.xz mirror://gentoo/texlive-module-bosisio.source-2016.tar.xz mirror://gentoo/texlive-module-bpchem.source-2016.tar.xz mirror://gentoo/texlive-module-bropd.source-2016.tar.xz mirror://gentoo/texlive-module-bytefield.source-2016.tar.xz mirror://gentoo/texlive-module-calculation.source-2016.tar.xz mirror://gentoo/texlive-module-ccfonts.source-2016.tar.xz mirror://gentoo/texlive-module-chemarrow.source-2016.tar.xz mirror://gentoo/texlive-module-chemcompounds.source-2016.tar.xz mirror://gentoo/texlive-module-chemschemex.source-2016.tar.xz mirror://gentoo/texlive-module-chemstyle.source-2016.tar.xz mirror://gentoo/texlive-module-computational-complexity.source-2016.tar.xz mirror://gentoo/texlive-module-concmath.source-2016.tar.xz mirror://gentoo/texlive-module-conteq.source-2016.tar.xz mirror://gentoo/texlive-module-delim.source-2016.tar.xz mirror://gentoo/texlive-module-delimset.source-2016.tar.xz mirror://gentoo/texlive-module-drawmatrix.source-2016.tar.xz mirror://gentoo/texlive-module-dyntree.source-2016.tar.xz mirror://gentoo/texlive-module-eqnarray.source-2016.tar.xz mirror://gentoo/texlive-module-extpfeil.source-2016.tar.xz mirror://gentoo/texlive-module-faktor.source-2016.tar.xz mirror://gentoo/texlive-module-fouridx.source-2016.tar.xz mirror://gentoo/texlive-module-functan.source-2016.tar.xz mirror://gentoo/texlive-module-galois.source-2016.tar.xz mirror://gentoo/texlive-module-grundgesetze.source-2016.tar.xz mirror://gentoo/texlive-module-ionumbers.source-2016.tar.xz mirror://gentoo/texlive-module-karnaugh-map.source-2016.tar.xz mirror://gentoo/texlive-module-karnaughmap.source-2016.tar.xz mirror://gentoo/texlive-module-logicproof.source-2016.tar.xz mirror://gentoo/texlive-module-lplfitch.source-2016.tar.xz mirror://gentoo/texlive-module-lstbayes.source-2016.tar.xz mirror://gentoo/texlive-module-mathcomp.source-2016.tar.xz mirror://gentoo/texlive-module-mathpartir.source-2016.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.source-2016.tar.xz mirror://gentoo/texlive-module-mattens.source-2016.tar.xz mirror://gentoo/texlive-module-mgltex.source-2016.tar.xz mirror://gentoo/texlive-module-miller.source-2016.tar.xz mirror://gentoo/texlive-module-multiobjective.source-2016.tar.xz mirror://gentoo/texlive-module-nucleardata.source-2016.tar.xz mirror://gentoo/texlive-module-objectz.source-2016.tar.xz mirror://gentoo/texlive-module-proba.source-2016.tar.xz mirror://gentoo/texlive-module-revquantum.source-2016.tar.xz mirror://gentoo/texlive-module-rmathbr.source-2016.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.source-2016.tar.xz mirror://gentoo/texlive-module-sesamanuel.source-2016.tar.xz mirror://gentoo/texlive-module-shuffle.source-2016.tar.xz mirror://gentoo/texlive-module-simplewick.source-2016.tar.xz mirror://gentoo/texlive-module-siunitx.source-2016.tar.xz mirror://gentoo/texlive-module-skmath.source-2016.tar.xz mirror://gentoo/texlive-module-spalign.source-2016.tar.xz mirror://gentoo/texlive-module-steinmetz.source-2016.tar.xz mirror://gentoo/texlive-module-stmaryrd.source-2016.tar.xz mirror://gentoo/texlive-module-struktex.source-2016.tar.xz mirror://gentoo/texlive-module-sympytexpackage.source-2016.tar.xz mirror://gentoo/texlive-module-tensor.source-2016.tar.xz mirror://gentoo/texlive-module-textopo.source-2016.tar.xz mirror://gentoo/texlive-module-thmbox.source-2016.tar.xz mirror://gentoo/texlive-module-turnstile.source-2016.tar.xz mirror://gentoo/texlive-module-ulqda.source-2016.tar.xz mirror://gentoo/texlive-module-unitsdef.source-2016.tar.xz mirror://gentoo/texlive-module-xymtex.source-2016.tar.xz mirror://gentoo/texlive-module-yhmath.source-2016.tar.xz mirror://gentoo/texlive-module-youngtab.source-2016.tar.xz mirror://gentoo/texlive-module-ytableau.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=a196987da2df9df603e2e48b0450d705
+_md5_=c57119b79037f5b74ef8c1c72c48a673
diff --git a/metadata/md5-cache/dev-texlive/texlive-metapost-2016 b/metadata/md5-cache/dev-texlive/texlive-metapost-2016
index d5874540e6c7..b8e0a536473c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-metapost-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-metapost-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive MetaPost and Metafont packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-automata-2016.tar.xz mirror://gentoo/texlive-module-bbcard-2016.tar.xz mirror://gentoo/texlive-module-blockdraw_mp-2016.tar.xz mirror://gentoo/texlive-module-bpolynomial-2016.tar.xz mirror://gentoo/texlive-module-cmarrows-2016.tar.xz mirror://gentoo/texlive-module-drv-2016.tar.xz mirror://gentoo/texlive-module-dviincl-2016.tar.xz mirror://gentoo/texlive-module-emp-2016.tar.xz mirror://gentoo/texlive-module-epsincl-2016.tar.xz mirror://gentoo/texlive-module-expressg-2016.tar.xz mirror://gentoo/texlive-module-exteps-2016.tar.xz mirror://gentoo/texlive-module-featpost-2016.tar.xz mirror://gentoo/texlive-module-feynmp-auto-2016.tar.xz mirror://gentoo/texlive-module-garrigues-2016.tar.xz mirror://gentoo/texlive-module-gmp-2016.tar.xz mirror://gentoo/texlive-module-hatching-2016.tar.xz mirror://gentoo/texlive-module-latexmp-2016.tar.xz mirror://gentoo/texlive-module-mcf2graph-2016.tar.xz mirror://gentoo/texlive-module-metago-2016.tar.xz mirror://gentoo/texlive-module-metaobj-2016.tar.xz mirror://gentoo/texlive-module-metaplot-2016.tar.xz mirror://gentoo/texlive-module-metapost-2016.tar.xz mirror://gentoo/texlive-module-metauml-2016.tar.xz mirror://gentoo/texlive-module-mfpic-2016.tar.xz mirror://gentoo/texlive-module-mfpic4ode-2016.tar.xz mirror://gentoo/texlive-module-mp3d-2016.tar.xz mirror://gentoo/texlive-module-mparrows-2016.tar.xz mirror://gentoo/texlive-module-mpattern-2016.tar.xz mirror://gentoo/texlive-module-mpcolornames-2016.tar.xz mirror://gentoo/texlive-module-mpgraphics-2016.tar.xz mirror://gentoo/texlive-module-piechartmp-2016.tar.xz mirror://gentoo/texlive-module-repere-2016.tar.xz mirror://gentoo/texlive-module-roex-2016.tar.xz mirror://gentoo/texlive-module-roundrect-2016.tar.xz mirror://gentoo/texlive-module-shapes-2016.tar.xz mirror://gentoo/texlive-module-slideshow-2016.tar.xz mirror://gentoo/texlive-module-splines-2016.tar.xz mirror://gentoo/texlive-module-suanpan-2016.tar.xz mirror://gentoo/texlive-module-textpath-2016.tar.xz mirror://gentoo/texlive-module-threeddice-2016.tar.xz mirror://gentoo/texlive-module-collection-metapost-2016.tar.xz doc? ( mirror://gentoo/texlive-module-automata.doc-2016.tar.xz mirror://gentoo/texlive-module-bbcard.doc-2016.tar.xz mirror://gentoo/texlive-module-blockdraw_mp.doc-2016.tar.xz mirror://gentoo/texlive-module-bpolynomial.doc-2016.tar.xz mirror://gentoo/texlive-module-cmarrows.doc-2016.tar.xz mirror://gentoo/texlive-module-drv.doc-2016.tar.xz mirror://gentoo/texlive-module-dviincl.doc-2016.tar.xz mirror://gentoo/texlive-module-emp.doc-2016.tar.xz mirror://gentoo/texlive-module-epsincl.doc-2016.tar.xz mirror://gentoo/texlive-module-expressg.doc-2016.tar.xz mirror://gentoo/texlive-module-exteps.doc-2016.tar.xz mirror://gentoo/texlive-module-featpost.doc-2016.tar.xz mirror://gentoo/texlive-module-feynmp-auto.doc-2016.tar.xz mirror://gentoo/texlive-module-garrigues.doc-2016.tar.xz mirror://gentoo/texlive-module-gmp.doc-2016.tar.xz mirror://gentoo/texlive-module-hatching.doc-2016.tar.xz mirror://gentoo/texlive-module-latexmp.doc-2016.tar.xz mirror://gentoo/texlive-module-mcf2graph.doc-2016.tar.xz mirror://gentoo/texlive-module-metago.doc-2016.tar.xz mirror://gentoo/texlive-module-metaobj.doc-2016.tar.xz mirror://gentoo/texlive-module-metaplot.doc-2016.tar.xz mirror://gentoo/texlive-module-metapost.doc-2016.tar.xz mirror://gentoo/texlive-module-metauml.doc-2016.tar.xz mirror://gentoo/texlive-module-mfpic.doc-2016.tar.xz mirror://gentoo/texlive-module-mfpic4ode.doc-2016.tar.xz mirror://gentoo/texlive-module-mp3d.doc-2016.tar.xz mirror://gentoo/texlive-module-mparrows.doc-2016.tar.xz mirror://gentoo/texlive-module-mpattern.doc-2016.tar.xz mirror://gentoo/texlive-module-mpcolornames.doc-2016.tar.xz mirror://gentoo/texlive-module-mpgraphics.doc-2016.tar.xz mirror://gentoo/texlive-module-piechartmp.doc-2016.tar.xz mirror://gentoo/texlive-module-repere.doc-2016.tar.xz mirror://gentoo/texlive-module-roundrect.doc-2016.tar.xz mirror://gentoo/texlive-module-shapes.doc-2016.tar.xz mirror://gentoo/texlive-module-slideshow.doc-2016.tar.xz mirror://gentoo/texlive-module-splines.doc-2016.tar.xz mirror://gentoo/texlive-module-suanpan.doc-2016.tar.xz mirror://gentoo/texlive-module-textpath.doc-2016.tar.xz mirror://gentoo/texlive-module-threeddice.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-emp.source-2016.tar.xz mirror://gentoo/texlive-module-expressg.source-2016.tar.xz mirror://gentoo/texlive-module-feynmp-auto.source-2016.tar.xz mirror://gentoo/texlive-module-gmp.source-2016.tar.xz mirror://gentoo/texlive-module-mfpic.source-2016.tar.xz mirror://gentoo/texlive-module-mfpic4ode.source-2016.tar.xz mirror://gentoo/texlive-module-mpcolornames.source-2016.tar.xz mirror://gentoo/texlive-module-mpgraphics.source-2016.tar.xz mirror://gentoo/texlive-module-roex.source-2016.tar.xz mirror://gentoo/texlive-module-roundrect.source-2016.tar.xz mirror://gentoo/texlive-module-shapes.source-2016.tar.xz mirror://gentoo/texlive-module-splines.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=2d1bc802a1903979949eee84d34685fc
+_md5_=409a0f5c91762a3c46a10ac8cff6e09b
diff --git a/metadata/md5-cache/dev-texlive/texlive-music-2016 b/metadata/md5-cache/dev-texlive/texlive-music-2016
index 1997605f8fe1..469d70edae03 100644
--- a/metadata/md5-cache/dev-texlive/texlive-music-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-music-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Music packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 MIT
 RDEPEND=>=dev-texlive/texlive-latex-2016 !<app-text/texlive-core-2011 !<dev-texlive/texlive-pictures-2015 !<dev-texlive/texlive-genericextra-2015 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abc-2016.tar.xz mirror://gentoo/texlive-module-autosp-2016.tar.xz mirror://gentoo/texlive-module-bagpipe-2016.tar.xz mirror://gentoo/texlive-module-figbas-2016.tar.xz mirror://gentoo/texlive-module-gchords-2016.tar.xz mirror://gentoo/texlive-module-gregoriotex-2016.tar.xz mirror://gentoo/texlive-module-gtrcrd-2016.tar.xz mirror://gentoo/texlive-module-guitar-2016.tar.xz mirror://gentoo/texlive-module-guitarchordschemes-2016.tar.xz mirror://gentoo/texlive-module-harmony-2016.tar.xz mirror://gentoo/texlive-module-leadsheets-2016.tar.xz mirror://gentoo/texlive-module-lilyglyphs-2016.tar.xz mirror://gentoo/texlive-module-m-tx-2016.tar.xz mirror://gentoo/texlive-module-musixguit-2016.tar.xz mirror://gentoo/texlive-module-musixtex-2016.tar.xz mirror://gentoo/texlive-module-musixtex-fonts-2016.tar.xz mirror://gentoo/texlive-module-musixtnt-2016.tar.xz mirror://gentoo/texlive-module-piano-2016.tar.xz mirror://gentoo/texlive-module-pmx-2016.tar.xz mirror://gentoo/texlive-module-pmxchords-2016.tar.xz mirror://gentoo/texlive-module-songbook-2016.tar.xz mirror://gentoo/texlive-module-songs-2016.tar.xz mirror://gentoo/texlive-module-xpiano-2016.tar.xz mirror://gentoo/texlive-module-collection-music-2016.tar.xz doc? ( mirror://gentoo/texlive-module-abc.doc-2016.tar.xz mirror://gentoo/texlive-module-autosp.doc-2016.tar.xz mirror://gentoo/texlive-module-bagpipe.doc-2016.tar.xz mirror://gentoo/texlive-module-figbas.doc-2016.tar.xz mirror://gentoo/texlive-module-gchords.doc-2016.tar.xz mirror://gentoo/texlive-module-gregoriotex.doc-2016.tar.xz mirror://gentoo/texlive-module-gtrcrd.doc-2016.tar.xz mirror://gentoo/texlive-module-guitar.doc-2016.tar.xz mirror://gentoo/texlive-module-guitarchordschemes.doc-2016.tar.xz mirror://gentoo/texlive-module-harmony.doc-2016.tar.xz mirror://gentoo/texlive-module-leadsheets.doc-2016.tar.xz mirror://gentoo/texlive-module-lilyglyphs.doc-2016.tar.xz mirror://gentoo/texlive-module-m-tx.doc-2016.tar.xz mirror://gentoo/texlive-module-musixguit.doc-2016.tar.xz mirror://gentoo/texlive-module-musixtex.doc-2016.tar.xz mirror://gentoo/texlive-module-musixtex-fonts.doc-2016.tar.xz mirror://gentoo/texlive-module-musixtnt.doc-2016.tar.xz mirror://gentoo/texlive-module-piano.doc-2016.tar.xz mirror://gentoo/texlive-module-pmx.doc-2016.tar.xz mirror://gentoo/texlive-module-pmxchords.doc-2016.tar.xz mirror://gentoo/texlive-module-songbook.doc-2016.tar.xz mirror://gentoo/texlive-module-songs.doc-2016.tar.xz mirror://gentoo/texlive-module-xpiano.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-abc.source-2016.tar.xz mirror://gentoo/texlive-module-guitar.source-2016.tar.xz mirror://gentoo/texlive-module-lilyglyphs.source-2016.tar.xz mirror://gentoo/texlive-module-musixtex.source-2016.tar.xz mirror://gentoo/texlive-module-songbook.source-2016.tar.xz mirror://gentoo/texlive-module-songs.source-2016.tar.xz mirror://gentoo/texlive-module-xpiano.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=8f8a182d1bdff45f43d8b6825bee1103
+_md5_=32c8d1ab7c28b007f655e1b6a458b3a3
diff --git a/metadata/md5-cache/dev-texlive/texlive-omega-2016 b/metadata/md5-cache/dev-texlive/texlive-omega-2016
index 0150032d7e7f..19b9fb946b9b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-omega-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-omega-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Omega packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-latex-2016 >=dev-texlive/texlive-latex-2008 !<dev-texlive/texlive-fontsextra-2009 !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2014 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aleph-2016.tar.xz mirror://gentoo/texlive-module-antomega-2016.tar.xz mirror://gentoo/texlive-module-lambda-2016.tar.xz mirror://gentoo/texlive-module-mxedruli-2016.tar.xz mirror://gentoo/texlive-module-omega-2016.tar.xz mirror://gentoo/texlive-module-omegaware-2016.tar.xz mirror://gentoo/texlive-module-otibet-2016.tar.xz mirror://gentoo/texlive-module-collection-omega-2016.tar.xz doc? ( mirror://gentoo/texlive-module-aleph.doc-2016.tar.xz mirror://gentoo/texlive-module-antomega.doc-2016.tar.xz mirror://gentoo/texlive-module-mxedruli.doc-2016.tar.xz mirror://gentoo/texlive-module-omega.doc-2016.tar.xz mirror://gentoo/texlive-module-omegaware.doc-2016.tar.xz mirror://gentoo/texlive-module-otibet.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-antomega.source-2016.tar.xz mirror://gentoo/texlive-module-otibet.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4998e393a86e38f7c49903cca9124cc9
+_md5_=0cd7d34849ed09973abf6729186b0fef
diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2016 b/metadata/md5-cache/dev-texlive/texlive-pictures-2016
index 4e49f5202d07..269b852c0a0b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pictures-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-pictures-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Graphics, pictures, diagrams
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-latexextra-2009 !<dev-texlive/texlive-texinfo-2009 >=dev-tex/pgf-3.0.1 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aobs-tikz-2016.tar.xz mirror://gentoo/texlive-module-askmaps-2016.tar.xz mirror://gentoo/texlive-module-asyfig-2016.tar.xz mirror://gentoo/texlive-module-asypictureb-2016.tar.xz mirror://gentoo/texlive-module-autoarea-2016.tar.xz mirror://gentoo/texlive-module-bardiag-2016.tar.xz mirror://gentoo/texlive-module-beamerswitch-2016.tar.xz mirror://gentoo/texlive-module-binarytree-2016.tar.xz mirror://gentoo/texlive-module-blochsphere-2016.tar.xz mirror://gentoo/texlive-module-bloques-2016.tar.xz mirror://gentoo/texlive-module-blox-2016.tar.xz mirror://gentoo/texlive-module-bodegraph-2016.tar.xz mirror://gentoo/texlive-module-bondgraph-2016.tar.xz mirror://gentoo/texlive-module-bondgraphs-2016.tar.xz mirror://gentoo/texlive-module-braids-2016.tar.xz mirror://gentoo/texlive-module-bxeepic-2016.tar.xz mirror://gentoo/texlive-module-cachepic-2016.tar.xz mirror://gentoo/texlive-module-celtic-2016.tar.xz mirror://gentoo/texlive-module-chemfig-2016.tar.xz mirror://gentoo/texlive-module-combinedgraphics-2016.tar.xz mirror://gentoo/texlive-module-circuitikz-2016.tar.xz mirror://gentoo/texlive-module-curve-2016.tar.xz mirror://gentoo/texlive-module-curve2e-2016.tar.xz mirror://gentoo/texlive-module-curves-2016.tar.xz mirror://gentoo/texlive-module-dcpic-2016.tar.xz mirror://gentoo/texlive-module-diagmac2-2016.tar.xz mirror://gentoo/texlive-module-doc-pictex-2016.tar.xz mirror://gentoo/texlive-module-dottex-2016.tar.xz mirror://gentoo/texlive-module-dratex-2016.tar.xz mirror://gentoo/texlive-module-drs-2016.tar.xz mirror://gentoo/texlive-module-duotenzor-2016.tar.xz mirror://gentoo/texlive-module-ecgdraw-2016.tar.xz mirror://gentoo/texlive-module-eepic-2016.tar.xz mirror://gentoo/texlive-module-ellipse-2016.tar.xz mirror://gentoo/texlive-module-epspdfconversion-2016.tar.xz mirror://gentoo/texlive-module-esk-2016.tar.xz mirror://gentoo/texlive-module-fast-diagram-2016.tar.xz mirror://gentoo/texlive-module-fig4latex-2016.tar.xz mirror://gentoo/texlive-module-fitbox-2016.tar.xz mirror://gentoo/texlive-module-flowchart-2016.tar.xz mirror://gentoo/texlive-module-forest-2016.tar.xz mirror://gentoo/texlive-module-genealogytree-2016.tar.xz mirror://gentoo/texlive-module-getmap-2016.tar.xz mirror://gentoo/texlive-module-gincltex-2016.tar.xz mirror://gentoo/texlive-module-gnuplottex-2016.tar.xz mirror://gentoo/texlive-module-gradientframe-2016.tar.xz mirror://gentoo/texlive-module-grafcet-2016.tar.xz mirror://gentoo/texlive-module-graphviz-2016.tar.xz mirror://gentoo/texlive-module-harveyballs-2016.tar.xz mirror://gentoo/texlive-module-here-2016.tar.xz mirror://gentoo/texlive-module-hf-tikz-2016.tar.xz mirror://gentoo/texlive-module-hobby-2016.tar.xz mirror://gentoo/texlive-module-hvfloat-2016.tar.xz mirror://gentoo/texlive-module-knitting-2016.tar.xz mirror://gentoo/texlive-module-knittingpattern-2016.tar.xz mirror://gentoo/texlive-module-lapdf-2016.tar.xz mirror://gentoo/texlive-module-latex-make-2016.tar.xz mirror://gentoo/texlive-module-lpic-2016.tar.xz mirror://gentoo/texlive-module-lroundrect-2016.tar.xz mirror://gentoo/texlive-module-makeshape-2016.tar.xz mirror://gentoo/texlive-module-mathspic-2016.tar.xz mirror://gentoo/texlive-module-miniplot-2016.tar.xz mirror://gentoo/texlive-module-mkpic-2016.tar.xz mirror://gentoo/texlive-module-modiagram-2016.tar.xz mirror://gentoo/texlive-module-neuralnetwork-2016.tar.xz mirror://gentoo/texlive-module-numericplots-2016.tar.xz mirror://gentoo/texlive-module-pb-diagram-2016.tar.xz mirror://gentoo/texlive-module-petri-nets-2016.tar.xz mirror://gentoo/texlive-module-pgf-blur-2016.tar.xz mirror://gentoo/texlive-module-pgf-soroban-2016.tar.xz mirror://gentoo/texlive-module-pgf-spectra-2016.tar.xz mirror://gentoo/texlive-module-pgf-umlcd-2016.tar.xz mirror://gentoo/texlive-module-pgf-umlsd-2016.tar.xz mirror://gentoo/texlive-module-pgfgantt-2016.tar.xz mirror://gentoo/texlive-module-pgfkeyx-2016.tar.xz mirror://gentoo/texlive-module-pgfmolbio-2016.tar.xz mirror://gentoo/texlive-module-pgfopts-2016.tar.xz mirror://gentoo/texlive-module-pgfornament-2016.tar.xz mirror://gentoo/texlive-module-pgfplots-2016.tar.xz mirror://gentoo/texlive-module-picinpar-2016.tar.xz mirror://gentoo/texlive-module-pict2e-2016.tar.xz mirror://gentoo/texlive-module-pictex-2016.tar.xz mirror://gentoo/texlive-module-pictex2-2016.tar.xz mirror://gentoo/texlive-module-pinlabel-2016.tar.xz mirror://gentoo/texlive-module-pmgraph-2016.tar.xz mirror://gentoo/texlive-module-prerex-2016.tar.xz mirror://gentoo/texlive-module-productbox-2016.tar.xz mirror://gentoo/texlive-module-pxpgfmark-2016.tar.xz mirror://gentoo/texlive-module-qcircuit-2016.tar.xz mirror://gentoo/texlive-module-qrcode-2016.tar.xz mirror://gentoo/texlive-module-randbild-2016.tar.xz mirror://gentoo/texlive-module-randomwalk-2016.tar.xz mirror://gentoo/texlive-module-reotex-2016.tar.xz mirror://gentoo/texlive-module-rviewport-2016.tar.xz mirror://gentoo/texlive-module-sa-tikz-2016.tar.xz mirror://gentoo/texlive-module-schemabloc-2016.tar.xz mirror://gentoo/texlive-module-scsnowman-2016.tar.xz mirror://gentoo/texlive-module-setdeck-2016.tar.xz mirror://gentoo/texlive-module-signchart-2016.tar.xz mirror://gentoo/texlive-module-smartdiagram-2016.tar.xz mirror://gentoo/texlive-module-spath3-2016.tar.xz mirror://gentoo/texlive-module-swimgraf-2016.tar.xz mirror://gentoo/texlive-module-table-fct-2016.tar.xz mirror://gentoo/texlive-module-texdraw-2016.tar.xz mirror://gentoo/texlive-module-ticollege-2016.tar.xz mirror://gentoo/texlive-module-tipfr-2016.tar.xz mirror://gentoo/texlive-module-tikz-3dplot-2016.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet-2016.tar.xz mirror://gentoo/texlive-module-tikz-cd-2016.tar.xz mirror://gentoo/texlive-module-tikz-dependency-2016.tar.xz mirror://gentoo/texlive-module-tikz-dimline-2016.tar.xz mirror://gentoo/texlive-module-tikz-feynman-2016.tar.xz mirror://gentoo/texlive-module-tikz-inet-2016.tar.xz mirror://gentoo/texlive-module-tikz-opm-2016.tar.xz mirror://gentoo/texlive-module-tikz-optics-2016.tar.xz mirror://gentoo/texlive-module-tikz-page-2016.tar.xz mirror://gentoo/texlive-module-tikz-palattice-2016.tar.xz mirror://gentoo/texlive-module-tikz-qtree-2016.tar.xz mirror://gentoo/texlive-module-tikz-timing-2016.tar.xz mirror://gentoo/texlive-module-tikzinclude-2016.tar.xz mirror://gentoo/texlive-module-tikzmark-2016.tar.xz mirror://gentoo/texlive-module-tikzorbital-2016.tar.xz mirror://gentoo/texlive-module-tikzpagenodes-2016.tar.xz mirror://gentoo/texlive-module-tikzpfeile-2016.tar.xz mirror://gentoo/texlive-module-tikzpeople-2016.tar.xz mirror://gentoo/texlive-module-tikzposter-2016.tar.xz mirror://gentoo/texlive-module-tikzscale-2016.tar.xz mirror://gentoo/texlive-module-tikzsymbols-2016.tar.xz mirror://gentoo/texlive-module-timing-diagrams-2016.tar.xz mirror://gentoo/texlive-module-tqft-2016.tar.xz mirror://gentoo/texlive-module-tkz-base-2016.tar.xz mirror://gentoo/texlive-module-tkz-berge-2016.tar.xz mirror://gentoo/texlive-module-tkz-doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-euclide-2016.tar.xz mirror://gentoo/texlive-module-tkz-fct-2016.tar.xz mirror://gentoo/texlive-module-tkz-graph-2016.tar.xz mirror://gentoo/texlive-module-tkz-kiviat-2016.tar.xz mirror://gentoo/texlive-module-tkz-linknodes-2016.tar.xz mirror://gentoo/texlive-module-tkz-orm-2016.tar.xz mirror://gentoo/texlive-module-tkz-tab-2016.tar.xz mirror://gentoo/texlive-module-tsemlines-2016.tar.xz mirror://gentoo/texlive-module-tufte-latex-2016.tar.xz mirror://gentoo/texlive-module-venndiagram-2016.tar.xz mirror://gentoo/texlive-module-visualpstricks-2016.tar.xz mirror://gentoo/texlive-module-xpicture-2016.tar.xz mirror://gentoo/texlive-module-xypic-2016.tar.xz mirror://gentoo/texlive-module-collection-pictures-2016.tar.xz doc? ( mirror://gentoo/texlive-module-aobs-tikz.doc-2016.tar.xz mirror://gentoo/texlive-module-askmaps.doc-2016.tar.xz mirror://gentoo/texlive-module-asyfig.doc-2016.tar.xz mirror://gentoo/texlive-module-asypictureb.doc-2016.tar.xz mirror://gentoo/texlive-module-autoarea.doc-2016.tar.xz mirror://gentoo/texlive-module-bardiag.doc-2016.tar.xz mirror://gentoo/texlive-module-beamerswitch.doc-2016.tar.xz mirror://gentoo/texlive-module-binarytree.doc-2016.tar.xz mirror://gentoo/texlive-module-blochsphere.doc-2016.tar.xz mirror://gentoo/texlive-module-bloques.doc-2016.tar.xz mirror://gentoo/texlive-module-blox.doc-2016.tar.xz mirror://gentoo/texlive-module-bodegraph.doc-2016.tar.xz mirror://gentoo/texlive-module-bondgraph.doc-2016.tar.xz mirror://gentoo/texlive-module-bondgraphs.doc-2016.tar.xz mirror://gentoo/texlive-module-braids.doc-2016.tar.xz mirror://gentoo/texlive-module-bxeepic.doc-2016.tar.xz mirror://gentoo/texlive-module-cachepic.doc-2016.tar.xz mirror://gentoo/texlive-module-celtic.doc-2016.tar.xz mirror://gentoo/texlive-module-chemfig.doc-2016.tar.xz mirror://gentoo/texlive-module-combinedgraphics.doc-2016.tar.xz mirror://gentoo/texlive-module-circuitikz.doc-2016.tar.xz mirror://gentoo/texlive-module-curve.doc-2016.tar.xz mirror://gentoo/texlive-module-curve2e.doc-2016.tar.xz mirror://gentoo/texlive-module-curves.doc-2016.tar.xz mirror://gentoo/texlive-module-dcpic.doc-2016.tar.xz mirror://gentoo/texlive-module-diagmac2.doc-2016.tar.xz mirror://gentoo/texlive-module-doc-pictex.doc-2016.tar.xz mirror://gentoo/texlive-module-dottex.doc-2016.tar.xz mirror://gentoo/texlive-module-dratex.doc-2016.tar.xz mirror://gentoo/texlive-module-drs.doc-2016.tar.xz mirror://gentoo/texlive-module-duotenzor.doc-2016.tar.xz mirror://gentoo/texlive-module-ecgdraw.doc-2016.tar.xz mirror://gentoo/texlive-module-eepic.doc-2016.tar.xz mirror://gentoo/texlive-module-ellipse.doc-2016.tar.xz mirror://gentoo/texlive-module-epspdfconversion.doc-2016.tar.xz mirror://gentoo/texlive-module-esk.doc-2016.tar.xz mirror://gentoo/texlive-module-fast-diagram.doc-2016.tar.xz mirror://gentoo/texlive-module-fig4latex.doc-2016.tar.xz mirror://gentoo/texlive-module-fitbox.doc-2016.tar.xz mirror://gentoo/texlive-module-flowchart.doc-2016.tar.xz mirror://gentoo/texlive-module-forest.doc-2016.tar.xz mirror://gentoo/texlive-module-genealogytree.doc-2016.tar.xz mirror://gentoo/texlive-module-getmap.doc-2016.tar.xz mirror://gentoo/texlive-module-gincltex.doc-2016.tar.xz mirror://gentoo/texlive-module-gnuplottex.doc-2016.tar.xz mirror://gentoo/texlive-module-gradientframe.doc-2016.tar.xz mirror://gentoo/texlive-module-grafcet.doc-2016.tar.xz mirror://gentoo/texlive-module-graphviz.doc-2016.tar.xz mirror://gentoo/texlive-module-harveyballs.doc-2016.tar.xz mirror://gentoo/texlive-module-here.doc-2016.tar.xz mirror://gentoo/texlive-module-hf-tikz.doc-2016.tar.xz mirror://gentoo/texlive-module-hobby.doc-2016.tar.xz mirror://gentoo/texlive-module-hvfloat.doc-2016.tar.xz mirror://gentoo/texlive-module-knitting.doc-2016.tar.xz mirror://gentoo/texlive-module-knittingpattern.doc-2016.tar.xz mirror://gentoo/texlive-module-lapdf.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-make.doc-2016.tar.xz mirror://gentoo/texlive-module-lpic.doc-2016.tar.xz mirror://gentoo/texlive-module-lroundrect.doc-2016.tar.xz mirror://gentoo/texlive-module-makeshape.doc-2016.tar.xz mirror://gentoo/texlive-module-mathspic.doc-2016.tar.xz mirror://gentoo/texlive-module-miniplot.doc-2016.tar.xz mirror://gentoo/texlive-module-mkpic.doc-2016.tar.xz mirror://gentoo/texlive-module-modiagram.doc-2016.tar.xz mirror://gentoo/texlive-module-neuralnetwork.doc-2016.tar.xz mirror://gentoo/texlive-module-numericplots.doc-2016.tar.xz mirror://gentoo/texlive-module-pb-diagram.doc-2016.tar.xz mirror://gentoo/texlive-module-petri-nets.doc-2016.tar.xz mirror://gentoo/texlive-module-pgf-blur.doc-2016.tar.xz mirror://gentoo/texlive-module-pgf-soroban.doc-2016.tar.xz mirror://gentoo/texlive-module-pgf-spectra.doc-2016.tar.xz mirror://gentoo/texlive-module-pgf-umlcd.doc-2016.tar.xz mirror://gentoo/texlive-module-pgf-umlsd.doc-2016.tar.xz mirror://gentoo/texlive-module-pgfgantt.doc-2016.tar.xz mirror://gentoo/texlive-module-pgfkeyx.doc-2016.tar.xz mirror://gentoo/texlive-module-pgfmolbio.doc-2016.tar.xz mirror://gentoo/texlive-module-pgfopts.doc-2016.tar.xz mirror://gentoo/texlive-module-pgfornament.doc-2016.tar.xz mirror://gentoo/texlive-module-pgfplots.doc-2016.tar.xz mirror://gentoo/texlive-module-picinpar.doc-2016.tar.xz mirror://gentoo/texlive-module-pict2e.doc-2016.tar.xz mirror://gentoo/texlive-module-pictex.doc-2016.tar.xz mirror://gentoo/texlive-module-pinlabel.doc-2016.tar.xz mirror://gentoo/texlive-module-pmgraph.doc-2016.tar.xz mirror://gentoo/texlive-module-prerex.doc-2016.tar.xz mirror://gentoo/texlive-module-productbox.doc-2016.tar.xz mirror://gentoo/texlive-module-pxpgfmark.doc-2016.tar.xz mirror://gentoo/texlive-module-qcircuit.doc-2016.tar.xz mirror://gentoo/texlive-module-qrcode.doc-2016.tar.xz mirror://gentoo/texlive-module-randbild.doc-2016.tar.xz mirror://gentoo/texlive-module-randomwalk.doc-2016.tar.xz mirror://gentoo/texlive-module-reotex.doc-2016.tar.xz mirror://gentoo/texlive-module-rviewport.doc-2016.tar.xz mirror://gentoo/texlive-module-sa-tikz.doc-2016.tar.xz mirror://gentoo/texlive-module-schemabloc.doc-2016.tar.xz mirror://gentoo/texlive-module-scsnowman.doc-2016.tar.xz mirror://gentoo/texlive-module-setdeck.doc-2016.tar.xz mirror://gentoo/texlive-module-signchart.doc-2016.tar.xz mirror://gentoo/texlive-module-smartdiagram.doc-2016.tar.xz mirror://gentoo/texlive-module-spath3.doc-2016.tar.xz mirror://gentoo/texlive-module-swimgraf.doc-2016.tar.xz mirror://gentoo/texlive-module-table-fct.doc-2016.tar.xz mirror://gentoo/texlive-module-texdraw.doc-2016.tar.xz mirror://gentoo/texlive-module-ticollege.doc-2016.tar.xz mirror://gentoo/texlive-module-tipfr.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-3dplot.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-cd.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-dependency.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-dimline.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-feynman.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-inet.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-opm.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-optics.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-page.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-palattice.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-qtree.doc-2016.tar.xz mirror://gentoo/texlive-module-tikz-timing.doc-2016.tar.xz mirror://gentoo/texlive-module-tikzinclude.doc-2016.tar.xz mirror://gentoo/texlive-module-tikzmark.doc-2016.tar.xz mirror://gentoo/texlive-module-tikzorbital.doc-2016.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.doc-2016.tar.xz mirror://gentoo/texlive-module-tikzpfeile.doc-2016.tar.xz mirror://gentoo/texlive-module-tikzpeople.doc-2016.tar.xz mirror://gentoo/texlive-module-tikzposter.doc-2016.tar.xz mirror://gentoo/texlive-module-tikzscale.doc-2016.tar.xz mirror://gentoo/texlive-module-tikzsymbols.doc-2016.tar.xz mirror://gentoo/texlive-module-timing-diagrams.doc-2016.tar.xz mirror://gentoo/texlive-module-tqft.doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-base.doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-berge.doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-doc.doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-euclide.doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-fct.doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-graph.doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-kiviat.doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-linknodes.doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-orm.doc-2016.tar.xz mirror://gentoo/texlive-module-tkz-tab.doc-2016.tar.xz mirror://gentoo/texlive-module-tufte-latex.doc-2016.tar.xz mirror://gentoo/texlive-module-venndiagram.doc-2016.tar.xz mirror://gentoo/texlive-module-visualpstricks.doc-2016.tar.xz mirror://gentoo/texlive-module-xpicture.doc-2016.tar.xz mirror://gentoo/texlive-module-xypic.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-aobs-tikz.source-2016.tar.xz mirror://gentoo/texlive-module-asyfig.source-2016.tar.xz mirror://gentoo/texlive-module-asypictureb.source-2016.tar.xz mirror://gentoo/texlive-module-beamerswitch.source-2016.tar.xz mirror://gentoo/texlive-module-binarytree.source-2016.tar.xz mirror://gentoo/texlive-module-blochsphere.source-2016.tar.xz mirror://gentoo/texlive-module-blox.source-2016.tar.xz mirror://gentoo/texlive-module-bondgraphs.source-2016.tar.xz mirror://gentoo/texlive-module-braids.source-2016.tar.xz mirror://gentoo/texlive-module-celtic.source-2016.tar.xz mirror://gentoo/texlive-module-combinedgraphics.source-2016.tar.xz mirror://gentoo/texlive-module-curve.source-2016.tar.xz mirror://gentoo/texlive-module-curve2e.source-2016.tar.xz mirror://gentoo/texlive-module-curves.source-2016.tar.xz mirror://gentoo/texlive-module-dottex.source-2016.tar.xz mirror://gentoo/texlive-module-ecgdraw.source-2016.tar.xz mirror://gentoo/texlive-module-ellipse.source-2016.tar.xz mirror://gentoo/texlive-module-esk.source-2016.tar.xz mirror://gentoo/texlive-module-fitbox.source-2016.tar.xz mirror://gentoo/texlive-module-flowchart.source-2016.tar.xz mirror://gentoo/texlive-module-forest.source-2016.tar.xz mirror://gentoo/texlive-module-gincltex.source-2016.tar.xz mirror://gentoo/texlive-module-gnuplottex.source-2016.tar.xz mirror://gentoo/texlive-module-gradientframe.source-2016.tar.xz mirror://gentoo/texlive-module-graphviz.source-2016.tar.xz mirror://gentoo/texlive-module-hf-tikz.source-2016.tar.xz mirror://gentoo/texlive-module-hobby.source-2016.tar.xz mirror://gentoo/texlive-module-latex-make.source-2016.tar.xz mirror://gentoo/texlive-module-lroundrect.source-2016.tar.xz mirror://gentoo/texlive-module-makeshape.source-2016.tar.xz mirror://gentoo/texlive-module-pgf-blur.source-2016.tar.xz mirror://gentoo/texlive-module-pgfgantt.source-2016.tar.xz mirror://gentoo/texlive-module-pgfmolbio.source-2016.tar.xz mirror://gentoo/texlive-module-pgfopts.source-2016.tar.xz mirror://gentoo/texlive-module-pgfplots.source-2016.tar.xz mirror://gentoo/texlive-module-pict2e.source-2016.tar.xz mirror://gentoo/texlive-module-productbox.source-2016.tar.xz mirror://gentoo/texlive-module-qrcode.source-2016.tar.xz mirror://gentoo/texlive-module-randbild.source-2016.tar.xz mirror://gentoo/texlive-module-randomwalk.source-2016.tar.xz mirror://gentoo/texlive-module-rviewport.source-2016.tar.xz mirror://gentoo/texlive-module-signchart.source-2016.tar.xz mirror://gentoo/texlive-module-smartdiagram.source-2016.tar.xz mirror://gentoo/texlive-module-spath3.source-2016.tar.xz mirror://gentoo/texlive-module-tikz-page.source-2016.tar.xz mirror://gentoo/texlive-module-tikz-timing.source-2016.tar.xz mirror://gentoo/texlive-module-tikzinclude.source-2016.tar.xz mirror://gentoo/texlive-module-tikzmark.source-2016.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.source-2016.tar.xz mirror://gentoo/texlive-module-tikzpfeile.source-2016.tar.xz mirror://gentoo/texlive-module-tikzposter.source-2016.tar.xz mirror://gentoo/texlive-module-tikzscale.source-2016.tar.xz mirror://gentoo/texlive-module-tikzsymbols.source-2016.tar.xz mirror://gentoo/texlive-module-tqft.source-2016.tar.xz mirror://gentoo/texlive-module-venndiagram.source-2016.tar.xz mirror://gentoo/texlive-module-xpicture.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=3004776ee7baaa21f8910609594efc12
+_md5_=0cbfe0381bbcb27aff9c00f1fc5eee08
diff --git a/metadata/md5-cache/dev-texlive/texlive-plainextra-2016 b/metadata/md5-cache/dev-texlive/texlive-plainextra-2016
index 5b8f3b75c3f7..d451e5d1b100 100644
--- a/metadata/md5-cache/dev-texlive/texlive-plainextra-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-plainextra-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Plain TeX packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-langvietnamese-2009 !dev-texlive/texlive-texinfo >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-epsf-dvipdfmx-2016.tar.xz mirror://gentoo/texlive-module-figflow-2016.tar.xz mirror://gentoo/texlive-module-fixpdfmag-2016.tar.xz mirror://gentoo/texlive-module-font-change-2016.tar.xz mirror://gentoo/texlive-module-fontch-2016.tar.xz mirror://gentoo/texlive-module-getoptk-2016.tar.xz mirror://gentoo/texlive-module-gfnotation-2016.tar.xz mirror://gentoo/texlive-module-graphics-pln-2016.tar.xz mirror://gentoo/texlive-module-hyplain-2016.tar.xz mirror://gentoo/texlive-module-js-misc-2016.tar.xz mirror://gentoo/texlive-module-mkpattern-2016.tar.xz mirror://gentoo/texlive-module-newsletr-2016.tar.xz mirror://gentoo/texlive-module-pitex-2016.tar.xz mirror://gentoo/texlive-module-placeins-plain-2016.tar.xz mirror://gentoo/texlive-module-plipsum-2016.tar.xz mirror://gentoo/texlive-module-plnfss-2016.tar.xz mirror://gentoo/texlive-module-plstmary-2016.tar.xz mirror://gentoo/texlive-module-present-2016.tar.xz mirror://gentoo/texlive-module-resumemac-2016.tar.xz mirror://gentoo/texlive-module-texinfo-2016.tar.xz mirror://gentoo/texlive-module-timetable-2016.tar.xz mirror://gentoo/texlive-module-treetex-2016.tar.xz mirror://gentoo/texlive-module-varisize-2016.tar.xz mirror://gentoo/texlive-module-xii-2016.tar.xz mirror://gentoo/texlive-module-collection-plainextra-2016.tar.xz doc? ( mirror://gentoo/texlive-module-epsf-dvipdfmx.doc-2016.tar.xz mirror://gentoo/texlive-module-figflow.doc-2016.tar.xz mirror://gentoo/texlive-module-font-change.doc-2016.tar.xz mirror://gentoo/texlive-module-fontch.doc-2016.tar.xz mirror://gentoo/texlive-module-getoptk.doc-2016.tar.xz mirror://gentoo/texlive-module-gfnotation.doc-2016.tar.xz mirror://gentoo/texlive-module-graphics-pln.doc-2016.tar.xz mirror://gentoo/texlive-module-hyplain.doc-2016.tar.xz mirror://gentoo/texlive-module-js-misc.doc-2016.tar.xz mirror://gentoo/texlive-module-mkpattern.doc-2016.tar.xz mirror://gentoo/texlive-module-newsletr.doc-2016.tar.xz mirror://gentoo/texlive-module-pitex.doc-2016.tar.xz mirror://gentoo/texlive-module-plipsum.doc-2016.tar.xz mirror://gentoo/texlive-module-plnfss.doc-2016.tar.xz mirror://gentoo/texlive-module-plstmary.doc-2016.tar.xz mirror://gentoo/texlive-module-present.doc-2016.tar.xz mirror://gentoo/texlive-module-resumemac.doc-2016.tar.xz mirror://gentoo/texlive-module-treetex.doc-2016.tar.xz mirror://gentoo/texlive-module-varisize.doc-2016.tar.xz mirror://gentoo/texlive-module-xii.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-graphics-pln.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=add93aac87fd7105d295903ae179b566
+_md5_=c9df42d5e8097d809e939a8f6f3a7f2a
diff --git a/metadata/md5-cache/dev-texlive/texlive-pstricks-2016 b/metadata/md5-cache/dev-texlive/texlive-pstricks-2016
index 2a24d2aa8a81..ff56ef6df42e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pstricks-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-pstricks-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive PSTricks
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-genericrecommended-2016 dev-texlive/texlive-genericrecommended dev-tex/pgf >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-auto-pst-pdf-2016.tar.xz mirror://gentoo/texlive-module-bclogo-2016.tar.xz mirror://gentoo/texlive-module-dsptricks-2016.tar.xz mirror://gentoo/texlive-module-makeplot-2016.tar.xz mirror://gentoo/texlive-module-pdftricks-2016.tar.xz mirror://gentoo/texlive-module-pdftricks2-2016.tar.xz mirror://gentoo/texlive-module-pedigree-perl-2016.tar.xz mirror://gentoo/texlive-module-psbao-2016.tar.xz mirror://gentoo/texlive-module-pst-2dplot-2016.tar.xz mirror://gentoo/texlive-module-pst-3d-2016.tar.xz mirror://gentoo/texlive-module-pst-3dplot-2016.tar.xz mirror://gentoo/texlive-module-pst-abspos-2016.tar.xz mirror://gentoo/texlive-module-pst-arrow-2016.tar.xz mirror://gentoo/texlive-module-pst-am-2016.tar.xz mirror://gentoo/texlive-module-pst-asr-2016.tar.xz mirror://gentoo/texlive-module-pst-bar-2016.tar.xz mirror://gentoo/texlive-module-pst-barcode-2016.tar.xz mirror://gentoo/texlive-module-pst-bezier-2016.tar.xz mirror://gentoo/texlive-module-pst-blur-2016.tar.xz mirror://gentoo/texlive-module-pst-bspline-2016.tar.xz mirror://gentoo/texlive-module-pst-calendar-2016.tar.xz mirror://gentoo/texlive-module-pst-cie-2016.tar.xz mirror://gentoo/texlive-module-pst-circ-2016.tar.xz mirror://gentoo/texlive-module-pst-coil-2016.tar.xz mirror://gentoo/texlive-module-pst-cox-2016.tar.xz mirror://gentoo/texlive-module-pst-dbicons-2016.tar.xz mirror://gentoo/texlive-module-pst-diffraction-2016.tar.xz mirror://gentoo/texlive-module-pst-electricfield-2016.tar.xz mirror://gentoo/texlive-module-pst-eps-2016.tar.xz mirror://gentoo/texlive-module-pst-eucl-2016.tar.xz mirror://gentoo/texlive-module-pst-exa-2016.tar.xz mirror://gentoo/texlive-module-pst-fill-2016.tar.xz mirror://gentoo/texlive-module-pst-fit-2016.tar.xz mirror://gentoo/texlive-module-pst-fr3d-2016.tar.xz mirror://gentoo/texlive-module-pst-fractal-2016.tar.xz mirror://gentoo/texlive-module-pst-fun-2016.tar.xz mirror://gentoo/texlive-module-pst-func-2016.tar.xz mirror://gentoo/texlive-module-pst-gantt-2016.tar.xz mirror://gentoo/texlive-module-pst-geo-2016.tar.xz mirror://gentoo/texlive-module-pst-ghsb-2016.tar.xz mirror://gentoo/texlive-module-pst-gr3d-2016.tar.xz mirror://gentoo/texlive-module-pst-grad-2016.tar.xz mirror://gentoo/texlive-module-pst-graphicx-2016.tar.xz mirror://gentoo/texlive-module-pst-infixplot-2016.tar.xz mirror://gentoo/texlive-module-pst-intersect-2016.tar.xz mirror://gentoo/texlive-module-pst-jtree-2016.tar.xz mirror://gentoo/texlive-module-pst-knot-2016.tar.xz mirror://gentoo/texlive-module-pst-labo-2016.tar.xz mirror://gentoo/texlive-module-pst-layout-2016.tar.xz mirror://gentoo/texlive-module-pst-lens-2016.tar.xz mirror://gentoo/texlive-module-pst-light3d-2016.tar.xz mirror://gentoo/texlive-module-pst-magneticfield-2016.tar.xz mirror://gentoo/texlive-module-pst-math-2016.tar.xz mirror://gentoo/texlive-module-pst-mirror-2016.tar.xz mirror://gentoo/texlive-module-pst-node-2016.tar.xz mirror://gentoo/texlive-module-pst-ob3d-2016.tar.xz mirror://gentoo/texlive-module-pst-ode-2016.tar.xz mirror://gentoo/texlive-module-pst-optexp-2016.tar.xz mirror://gentoo/texlive-module-pst-optic-2016.tar.xz mirror://gentoo/texlive-module-pst-osci-2016.tar.xz mirror://gentoo/texlive-module-pst-ovl-2016.tar.xz mirror://gentoo/texlive-module-pst-pad-2016.tar.xz mirror://gentoo/texlive-module-pst-pdgr-2016.tar.xz mirror://gentoo/texlive-module-pst-perspective-2016.tar.xz mirror://gentoo/texlive-module-pst-platon-2016.tar.xz mirror://gentoo/texlive-module-pst-plot-2016.tar.xz mirror://gentoo/texlive-module-pst-poly-2016.tar.xz mirror://gentoo/texlive-module-pst-pulley-2016.tar.xz mirror://gentoo/texlive-module-pst-qtree-2016.tar.xz mirror://gentoo/texlive-module-pst-rubans-2016.tar.xz mirror://gentoo/texlive-module-pst-shell-2016.tar.xz mirror://gentoo/texlive-module-pst-sigsys-2016.tar.xz mirror://gentoo/texlive-module-pst-slpe-2016.tar.xz mirror://gentoo/texlive-module-pst-solarsystem-2016.tar.xz mirror://gentoo/texlive-module-pst-solides3d-2016.tar.xz mirror://gentoo/texlive-module-pst-soroban-2016.tar.xz mirror://gentoo/texlive-module-pst-spectra-2016.tar.xz mirror://gentoo/texlive-module-pst-spirograph-2016.tar.xz mirror://gentoo/texlive-module-pst-stru-2016.tar.xz mirror://gentoo/texlive-module-pst-support-2016.tar.xz mirror://gentoo/texlive-module-pst-text-2016.tar.xz mirror://gentoo/texlive-module-pst-thick-2016.tar.xz mirror://gentoo/texlive-module-pst-tools-2016.tar.xz mirror://gentoo/texlive-module-pst-tree-2016.tar.xz mirror://gentoo/texlive-module-pst-tvz-2016.tar.xz mirror://gentoo/texlive-module-pst-uml-2016.tar.xz mirror://gentoo/texlive-module-pst-vectorian-2016.tar.xz mirror://gentoo/texlive-module-pst-vowel-2016.tar.xz mirror://gentoo/texlive-module-pst-vue3d-2016.tar.xz mirror://gentoo/texlive-module-pst2pdf-2016.tar.xz mirror://gentoo/texlive-module-pstricks-2016.tar.xz mirror://gentoo/texlive-module-pstricks-add-2016.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes-2016.tar.xz mirror://gentoo/texlive-module-uml-2016.tar.xz mirror://gentoo/texlive-module-vaucanson-g-2016.tar.xz mirror://gentoo/texlive-module-vocaltract-2016.tar.xz mirror://gentoo/texlive-module-collection-pstricks-2016.tar.xz doc? ( mirror://gentoo/texlive-module-auto-pst-pdf.doc-2016.tar.xz mirror://gentoo/texlive-module-bclogo.doc-2016.tar.xz mirror://gentoo/texlive-module-dsptricks.doc-2016.tar.xz mirror://gentoo/texlive-module-makeplot.doc-2016.tar.xz mirror://gentoo/texlive-module-pdftricks.doc-2016.tar.xz mirror://gentoo/texlive-module-pdftricks2.doc-2016.tar.xz mirror://gentoo/texlive-module-pedigree-perl.doc-2016.tar.xz mirror://gentoo/texlive-module-psbao.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-2dplot.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-3d.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-3dplot.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-abspos.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-arrow.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-am.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-asr.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-bar.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-barcode.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-bezier.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-blur.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-bspline.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-calendar.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-cie.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-circ.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-coil.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-cox.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-dbicons.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-diffraction.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-electricfield.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-eps.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-eucl.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-exa.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-fill.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-fit.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-fr3d.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-fractal.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-fun.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-func.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-gantt.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-geo.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-ghsb.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-gr3d.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-grad.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-graphicx.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-infixplot.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-intersect.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-jtree.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-knot.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-labo.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-layout.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-lens.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-light3d.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-math.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-mirror.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-node.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-ob3d.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-ode.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-optexp.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-optic.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-osci.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-ovl.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-pad.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-pdgr.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-perspective.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-platon.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-plot.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-poly.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-pulley.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-qtree.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-rubans.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-shell.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-sigsys.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-slpe.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-solides3d.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-soroban.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-spectra.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-spirograph.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-stru.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-support.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-text.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-thick.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-tools.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-tree.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-tvz.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-uml.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-vectorian.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-vowel.doc-2016.tar.xz mirror://gentoo/texlive-module-pst-vue3d.doc-2016.tar.xz mirror://gentoo/texlive-module-pst2pdf.doc-2016.tar.xz mirror://gentoo/texlive-module-pstricks.doc-2016.tar.xz mirror://gentoo/texlive-module-pstricks-add.doc-2016.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes.doc-2016.tar.xz mirror://gentoo/texlive-module-uml.doc-2016.tar.xz mirror://gentoo/texlive-module-vaucanson-g.doc-2016.tar.xz mirror://gentoo/texlive-module-vocaltract.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-auto-pst-pdf.source-2016.tar.xz mirror://gentoo/texlive-module-makeplot.source-2016.tar.xz mirror://gentoo/texlive-module-pst-3d.source-2016.tar.xz mirror://gentoo/texlive-module-pst-abspos.source-2016.tar.xz mirror://gentoo/texlive-module-pst-am.source-2016.tar.xz mirror://gentoo/texlive-module-pst-bar.source-2016.tar.xz mirror://gentoo/texlive-module-pst-blur.source-2016.tar.xz mirror://gentoo/texlive-module-pst-dbicons.source-2016.tar.xz mirror://gentoo/texlive-module-pst-diffraction.source-2016.tar.xz mirror://gentoo/texlive-module-pst-electricfield.source-2016.tar.xz mirror://gentoo/texlive-module-pst-eps.source-2016.tar.xz mirror://gentoo/texlive-module-pst-fill.source-2016.tar.xz mirror://gentoo/texlive-module-pst-fit.source-2016.tar.xz mirror://gentoo/texlive-module-pst-fr3d.source-2016.tar.xz mirror://gentoo/texlive-module-pst-fun.source-2016.tar.xz mirror://gentoo/texlive-module-pst-gr3d.source-2016.tar.xz mirror://gentoo/texlive-module-pst-intersect.source-2016.tar.xz mirror://gentoo/texlive-module-pst-lens.source-2016.tar.xz mirror://gentoo/texlive-module-pst-light3d.source-2016.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.source-2016.tar.xz mirror://gentoo/texlive-module-pst-ob3d.source-2016.tar.xz mirror://gentoo/texlive-module-pst-optexp.source-2016.tar.xz mirror://gentoo/texlive-module-pst-pad.source-2016.tar.xz mirror://gentoo/texlive-module-pst-pdgr.source-2016.tar.xz mirror://gentoo/texlive-module-pst-platon.source-2016.tar.xz mirror://gentoo/texlive-module-pst-pulley.source-2016.tar.xz mirror://gentoo/texlive-module-pst-rubans.source-2016.tar.xz mirror://gentoo/texlive-module-pst-shell.source-2016.tar.xz mirror://gentoo/texlive-module-pst-slpe.source-2016.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.source-2016.tar.xz mirror://gentoo/texlive-module-pst-soroban.source-2016.tar.xz mirror://gentoo/texlive-module-pst-text.source-2016.tar.xz mirror://gentoo/texlive-module-pst-thick.source-2016.tar.xz mirror://gentoo/texlive-module-pst-tree.source-2016.tar.xz mirror://gentoo/texlive-module-pst-tvz.source-2016.tar.xz mirror://gentoo/texlive-module-pst-uml.source-2016.tar.xz mirror://gentoo/texlive-module-pst-vue3d.source-2016.tar.xz mirror://gentoo/texlive-module-uml.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=71ab32dde837f4b9f2d5587dec299423
+_md5_=1b2a9e5e940d2d96090d36e9b08426df
diff --git a/metadata/md5-cache/dev-texlive/texlive-publishers-2016 b/metadata/md5-cache/dev-texlive/texlive-publishers-2016
index bd186e287999..963ec7f37398 100644
--- a/metadata/md5-cache/dev-texlive/texlive-publishers-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-publishers-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Publisher styles, theses, etc.
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2016 !<dev-texlive/texlive-latexextra-2014 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-IEEEconf-2016.tar.xz mirror://gentoo/texlive-module-IEEEtran-2016.tar.xz mirror://gentoo/texlive-module-aastex-2016.tar.xz mirror://gentoo/texlive-module-abntex2-2016.tar.xz mirror://gentoo/texlive-module-acmart-2016.tar.xz mirror://gentoo/texlive-module-acmconf-2016.tar.xz mirror://gentoo/texlive-module-active-conf-2016.tar.xz mirror://gentoo/texlive-module-adfathesis-2016.tar.xz mirror://gentoo/texlive-module-afparticle-2016.tar.xz mirror://gentoo/texlive-module-afthesis-2016.tar.xz mirror://gentoo/texlive-module-aguplus-2016.tar.xz mirror://gentoo/texlive-module-aiaa-2016.tar.xz mirror://gentoo/texlive-module-ametsoc-2016.tar.xz mirror://gentoo/texlive-module-anufinalexam-2016.tar.xz mirror://gentoo/texlive-module-aomart-2016.tar.xz mirror://gentoo/texlive-module-apa-2016.tar.xz mirror://gentoo/texlive-module-apa6-2016.tar.xz mirror://gentoo/texlive-module-apa6e-2016.tar.xz mirror://gentoo/texlive-module-arsclassica-2016.tar.xz mirror://gentoo/texlive-module-articleingud-2016.tar.xz mirror://gentoo/texlive-module-asaetr-2016.tar.xz mirror://gentoo/texlive-module-ascelike-2016.tar.xz mirror://gentoo/texlive-module-aucklandthesis-2016.tar.xz mirror://gentoo/texlive-module-bangorcsthesis-2016.tar.xz mirror://gentoo/texlive-module-bangorexam-2016.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin-2016.tar.xz mirror://gentoo/texlive-module-beamer-verona-2016.tar.xz mirror://gentoo/texlive-module-bgteubner-2016.tar.xz mirror://gentoo/texlive-module-br-lex-2016.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation-2016.tar.xz mirror://gentoo/texlive-module-cascadilla-2016.tar.xz mirror://gentoo/texlive-module-chem-journal-2016.tar.xz mirror://gentoo/texlive-module-classicthesis-2016.tar.xz mirror://gentoo/texlive-module-cleanthesis-2016.tar.xz mirror://gentoo/texlive-module-cmpj-2016.tar.xz mirror://gentoo/texlive-module-confproc-2016.tar.xz mirror://gentoo/texlive-module-cquthesis-2016.tar.xz mirror://gentoo/texlive-module-dccpaper-2016.tar.xz mirror://gentoo/texlive-module-dithesis-2016.tar.xz mirror://gentoo/texlive-module-ebook-2016.tar.xz mirror://gentoo/texlive-module-ebsthesis-2016.tar.xz mirror://gentoo/texlive-module-ejpecp-2016.tar.xz mirror://gentoo/texlive-module-ekaia-2016.tar.xz mirror://gentoo/texlive-module-elbioimp-2016.tar.xz mirror://gentoo/texlive-module-elsarticle-2016.tar.xz mirror://gentoo/texlive-module-elteikthesis-2016.tar.xz mirror://gentoo/texlive-module-emisa-2016.tar.xz mirror://gentoo/texlive-module-erdc-2016.tar.xz mirror://gentoo/texlive-module-estcpmm-2016.tar.xz mirror://gentoo/texlive-module-fbithesis-2016.tar.xz mirror://gentoo/texlive-module-fcavtex-2016.tar.xz mirror://gentoo/texlive-module-fcltxdoc-2016.tar.xz mirror://gentoo/texlive-module-fei-2016.tar.xz mirror://gentoo/texlive-module-gaceta-2016.tar.xz mirror://gentoo/texlive-module-gatech-thesis-2016.tar.xz mirror://gentoo/texlive-module-gradstudentresume-2016.tar.xz mirror://gentoo/texlive-module-grant-2016.tar.xz mirror://gentoo/texlive-module-gsemthesis-2016.tar.xz mirror://gentoo/texlive-module-gzt-2016.tar.xz mirror://gentoo/texlive-module-h2020proposal-2016.tar.xz mirror://gentoo/texlive-module-har2nat-2016.tar.xz mirror://gentoo/texlive-module-hobete-2016.tar.xz mirror://gentoo/texlive-module-hustthesis-2016.tar.xz mirror://gentoo/texlive-module-icsv-2016.tar.xz mirror://gentoo/texlive-module-ieeepes-2016.tar.xz mirror://gentoo/texlive-module-ijmart-2016.tar.xz mirror://gentoo/texlive-module-ijsra-2016.tar.xz mirror://gentoo/texlive-module-imac-2016.tar.xz mirror://gentoo/texlive-module-imtekda-2016.tar.xz mirror://gentoo/texlive-module-iscram-2016.tar.xz mirror://gentoo/texlive-module-jacow-2016.tar.xz mirror://gentoo/texlive-module-jmlr-2016.tar.xz mirror://gentoo/texlive-module-jpsj-2016.tar.xz mirror://gentoo/texlive-module-kdgdocs-2016.tar.xz mirror://gentoo/texlive-module-kluwer-2016.tar.xz mirror://gentoo/texlive-module-ksp-thesis-2016.tar.xz mirror://gentoo/texlive-module-langsci-2016.tar.xz mirror://gentoo/texlive-module-lps-2016.tar.xz mirror://gentoo/texlive-module-matc3-2016.tar.xz mirror://gentoo/texlive-module-matc3mem-2016.tar.xz mirror://gentoo/texlive-module-mcmthesis-2016.tar.xz mirror://gentoo/texlive-module-mentis-2016.tar.xz mirror://gentoo/texlive-module-mnras-2016.tar.xz mirror://gentoo/texlive-module-msu-thesis-2016.tar.xz mirror://gentoo/texlive-module-mugsthesis-2016.tar.xz mirror://gentoo/texlive-module-musuos-2016.tar.xz mirror://gentoo/texlive-module-muthesis-2016.tar.xz mirror://gentoo/texlive-module-mynsfc-2016.tar.xz mirror://gentoo/texlive-module-nature-2016.tar.xz mirror://gentoo/texlive-module-navydocs-2016.tar.xz mirror://gentoo/texlive-module-nddiss-2016.tar.xz mirror://gentoo/texlive-module-ndsu-thesis-2016.tar.xz mirror://gentoo/texlive-module-nwejm-2016.tar.xz mirror://gentoo/texlive-module-nih-2016.tar.xz mirror://gentoo/texlive-module-nihbiosketch-2016.tar.xz mirror://gentoo/texlive-module-nostarch-2016.tar.xz mirror://gentoo/texlive-module-nrc-2016.tar.xz mirror://gentoo/texlive-module-onrannual-2016.tar.xz mirror://gentoo/texlive-module-opteng-2016.tar.xz mirror://gentoo/texlive-module-philosophersimprint-2016.tar.xz mirror://gentoo/texlive-module-pittetd-2016.tar.xz mirror://gentoo/texlive-module-pkuthss-2016.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin-2016.tar.xz mirror://gentoo/texlive-module-pracjourn-2016.tar.xz mirror://gentoo/texlive-module-procIAGssymp-2016.tar.xz mirror://gentoo/texlive-module-proposal-2016.tar.xz mirror://gentoo/texlive-module-ptptex-2016.tar.xz mirror://gentoo/texlive-module-psu-thesis-2016.tar.xz mirror://gentoo/texlive-module-resphilosophica-2016.tar.xz mirror://gentoo/texlive-module-resumecls-2016.tar.xz mirror://gentoo/texlive-module-revtex-2016.tar.xz mirror://gentoo/texlive-module-revtex4-2016.tar.xz mirror://gentoo/texlive-module-ryethesis-2016.tar.xz mirror://gentoo/texlive-module-sageep-2016.tar.xz mirror://gentoo/texlive-module-sapthesis-2016.tar.xz mirror://gentoo/texlive-module-scrjrnl-2016.tar.xz mirror://gentoo/texlive-module-schule-2016.tar.xz mirror://gentoo/texlive-module-sduthesis-2016.tar.xz mirror://gentoo/texlive-module-seuthesis-2016.tar.xz mirror://gentoo/texlive-module-seuthesix-2016.tar.xz mirror://gentoo/texlive-module-soton-2016.tar.xz mirror://gentoo/texlive-module-sphdthesis-2016.tar.xz mirror://gentoo/texlive-module-spie-2016.tar.xz mirror://gentoo/texlive-module-sr-vorl-2016.tar.xz mirror://gentoo/texlive-module-stellenbosch-2016.tar.xz mirror://gentoo/texlive-module-suftesi-2016.tar.xz mirror://gentoo/texlive-module-sugconf-2016.tar.xz mirror://gentoo/texlive-module-tabriz-thesis-2016.tar.xz mirror://gentoo/texlive-module-texilikechaps-2016.tar.xz mirror://gentoo/texlive-module-texilikecover-2016.tar.xz mirror://gentoo/texlive-module-thesis-ekf-2016.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac-2016.tar.xz mirror://gentoo/texlive-module-thuthesis-2016.tar.xz mirror://gentoo/texlive-module-toptesi-2016.tar.xz mirror://gentoo/texlive-module-tudscr-2016.tar.xz mirror://gentoo/texlive-module-tugboat-2016.tar.xz mirror://gentoo/texlive-module-tugboat-plain-2016.tar.xz mirror://gentoo/texlive-module-turabian-2016.tar.xz mirror://gentoo/texlive-module-tui-2016.tar.xz mirror://gentoo/texlive-module-uaclasses-2016.tar.xz mirror://gentoo/texlive-module-uafthesis-2016.tar.xz mirror://gentoo/texlive-module-uantwerpendocs-2016.tar.xz mirror://gentoo/texlive-module-ucbthesis-2016.tar.xz mirror://gentoo/texlive-module-ucdavisthesis-2016.tar.xz mirror://gentoo/texlive-module-ucthesis-2016.tar.xz mirror://gentoo/texlive-module-uestcthesis-2016.tar.xz mirror://gentoo/texlive-module-uiucredborder-2016.tar.xz mirror://gentoo/texlive-module-uiucthesis-2016.tar.xz mirror://gentoo/texlive-module-ulthese-2016.tar.xz mirror://gentoo/texlive-module-umbclegislation-2016.tar.xz mirror://gentoo/texlive-module-umthesis-2016.tar.xz mirror://gentoo/texlive-module-umich-thesis-2016.tar.xz mirror://gentoo/texlive-module-unamth-template-2016.tar.xz mirror://gentoo/texlive-module-unamthesis-2016.tar.xz mirror://gentoo/texlive-module-unswcover-2016.tar.xz mirror://gentoo/texlive-module-uothesis-2016.tar.xz mirror://gentoo/texlive-module-urcls-2016.tar.xz mirror://gentoo/texlive-module-uowthesis-2016.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage-2016.tar.xz mirror://gentoo/texlive-module-uspatent-2016.tar.xz mirror://gentoo/texlive-module-ut-thesis-2016.tar.xz mirror://gentoo/texlive-module-uwthesis-2016.tar.xz mirror://gentoo/texlive-module-vancouver-2016.tar.xz mirror://gentoo/texlive-module-xduthesis-2016.tar.xz mirror://gentoo/texlive-module-wsemclassic-2016.tar.xz mirror://gentoo/texlive-module-xcookybooky-2016.tar.xz mirror://gentoo/texlive-module-yathesis-2016.tar.xz mirror://gentoo/texlive-module-york-thesis-2016.tar.xz mirror://gentoo/texlive-module-collection-publishers-2016.tar.xz doc? ( mirror://gentoo/texlive-module-IEEEconf.doc-2016.tar.xz mirror://gentoo/texlive-module-IEEEtran.doc-2016.tar.xz mirror://gentoo/texlive-module-aastex.doc-2016.tar.xz mirror://gentoo/texlive-module-abntex2.doc-2016.tar.xz mirror://gentoo/texlive-module-acmart.doc-2016.tar.xz mirror://gentoo/texlive-module-acmconf.doc-2016.tar.xz mirror://gentoo/texlive-module-active-conf.doc-2016.tar.xz mirror://gentoo/texlive-module-adfathesis.doc-2016.tar.xz mirror://gentoo/texlive-module-afparticle.doc-2016.tar.xz mirror://gentoo/texlive-module-afthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-aguplus.doc-2016.tar.xz mirror://gentoo/texlive-module-aiaa.doc-2016.tar.xz mirror://gentoo/texlive-module-ametsoc.doc-2016.tar.xz mirror://gentoo/texlive-module-anufinalexam.doc-2016.tar.xz mirror://gentoo/texlive-module-aomart.doc-2016.tar.xz mirror://gentoo/texlive-module-apa.doc-2016.tar.xz mirror://gentoo/texlive-module-apa6.doc-2016.tar.xz mirror://gentoo/texlive-module-apa6e.doc-2016.tar.xz mirror://gentoo/texlive-module-arsclassica.doc-2016.tar.xz mirror://gentoo/texlive-module-articleingud.doc-2016.tar.xz mirror://gentoo/texlive-module-asaetr.doc-2016.tar.xz mirror://gentoo/texlive-module-ascelike.doc-2016.tar.xz mirror://gentoo/texlive-module-aucklandthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-bangorexam.doc-2016.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin.doc-2016.tar.xz mirror://gentoo/texlive-module-beamer-verona.doc-2016.tar.xz mirror://gentoo/texlive-module-bgteubner.doc-2016.tar.xz mirror://gentoo/texlive-module-br-lex.doc-2016.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.doc-2016.tar.xz mirror://gentoo/texlive-module-cascadilla.doc-2016.tar.xz mirror://gentoo/texlive-module-classicthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-cleanthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-cmpj.doc-2016.tar.xz mirror://gentoo/texlive-module-confproc.doc-2016.tar.xz mirror://gentoo/texlive-module-cquthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-dccpaper.doc-2016.tar.xz mirror://gentoo/texlive-module-dithesis.doc-2016.tar.xz mirror://gentoo/texlive-module-ebook.doc-2016.tar.xz mirror://gentoo/texlive-module-ebsthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-ejpecp.doc-2016.tar.xz mirror://gentoo/texlive-module-ekaia.doc-2016.tar.xz mirror://gentoo/texlive-module-elbioimp.doc-2016.tar.xz mirror://gentoo/texlive-module-elsarticle.doc-2016.tar.xz mirror://gentoo/texlive-module-elteikthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-emisa.doc-2016.tar.xz mirror://gentoo/texlive-module-erdc.doc-2016.tar.xz mirror://gentoo/texlive-module-estcpmm.doc-2016.tar.xz mirror://gentoo/texlive-module-fbithesis.doc-2016.tar.xz mirror://gentoo/texlive-module-fcavtex.doc-2016.tar.xz mirror://gentoo/texlive-module-fcltxdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-fei.doc-2016.tar.xz mirror://gentoo/texlive-module-gaceta.doc-2016.tar.xz mirror://gentoo/texlive-module-gatech-thesis.doc-2016.tar.xz mirror://gentoo/texlive-module-gradstudentresume.doc-2016.tar.xz mirror://gentoo/texlive-module-grant.doc-2016.tar.xz mirror://gentoo/texlive-module-gsemthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-gzt.doc-2016.tar.xz mirror://gentoo/texlive-module-h2020proposal.doc-2016.tar.xz mirror://gentoo/texlive-module-har2nat.doc-2016.tar.xz mirror://gentoo/texlive-module-hobete.doc-2016.tar.xz mirror://gentoo/texlive-module-hustthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-icsv.doc-2016.tar.xz mirror://gentoo/texlive-module-ieeepes.doc-2016.tar.xz mirror://gentoo/texlive-module-ijmart.doc-2016.tar.xz mirror://gentoo/texlive-module-ijsra.doc-2016.tar.xz mirror://gentoo/texlive-module-imac.doc-2016.tar.xz mirror://gentoo/texlive-module-imtekda.doc-2016.tar.xz mirror://gentoo/texlive-module-iscram.doc-2016.tar.xz mirror://gentoo/texlive-module-jacow.doc-2016.tar.xz mirror://gentoo/texlive-module-jmlr.doc-2016.tar.xz mirror://gentoo/texlive-module-jpsj.doc-2016.tar.xz mirror://gentoo/texlive-module-kdgdocs.doc-2016.tar.xz mirror://gentoo/texlive-module-kluwer.doc-2016.tar.xz mirror://gentoo/texlive-module-ksp-thesis.doc-2016.tar.xz mirror://gentoo/texlive-module-langsci.doc-2016.tar.xz mirror://gentoo/texlive-module-lps.doc-2016.tar.xz mirror://gentoo/texlive-module-matc3.doc-2016.tar.xz mirror://gentoo/texlive-module-matc3mem.doc-2016.tar.xz mirror://gentoo/texlive-module-mcmthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-mentis.doc-2016.tar.xz mirror://gentoo/texlive-module-mnras.doc-2016.tar.xz mirror://gentoo/texlive-module-msu-thesis.doc-2016.tar.xz mirror://gentoo/texlive-module-mugsthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-musuos.doc-2016.tar.xz mirror://gentoo/texlive-module-muthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-mynsfc.doc-2016.tar.xz mirror://gentoo/texlive-module-nature.doc-2016.tar.xz mirror://gentoo/texlive-module-navydocs.doc-2016.tar.xz mirror://gentoo/texlive-module-nddiss.doc-2016.tar.xz mirror://gentoo/texlive-module-ndsu-thesis.doc-2016.tar.xz mirror://gentoo/texlive-module-nwejm.doc-2016.tar.xz mirror://gentoo/texlive-module-nih.doc-2016.tar.xz mirror://gentoo/texlive-module-nihbiosketch.doc-2016.tar.xz mirror://gentoo/texlive-module-nostarch.doc-2016.tar.xz mirror://gentoo/texlive-module-nrc.doc-2016.tar.xz mirror://gentoo/texlive-module-onrannual.doc-2016.tar.xz mirror://gentoo/texlive-module-opteng.doc-2016.tar.xz mirror://gentoo/texlive-module-philosophersimprint.doc-2016.tar.xz mirror://gentoo/texlive-module-pittetd.doc-2016.tar.xz mirror://gentoo/texlive-module-pkuthss.doc-2016.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin.doc-2016.tar.xz mirror://gentoo/texlive-module-pracjourn.doc-2016.tar.xz mirror://gentoo/texlive-module-procIAGssymp.doc-2016.tar.xz mirror://gentoo/texlive-module-proposal.doc-2016.tar.xz mirror://gentoo/texlive-module-ptptex.doc-2016.tar.xz mirror://gentoo/texlive-module-psu-thesis.doc-2016.tar.xz mirror://gentoo/texlive-module-resphilosophica.doc-2016.tar.xz mirror://gentoo/texlive-module-resumecls.doc-2016.tar.xz mirror://gentoo/texlive-module-revtex.doc-2016.tar.xz mirror://gentoo/texlive-module-revtex4.doc-2016.tar.xz mirror://gentoo/texlive-module-ryethesis.doc-2016.tar.xz mirror://gentoo/texlive-module-sageep.doc-2016.tar.xz mirror://gentoo/texlive-module-sapthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-scrjrnl.doc-2016.tar.xz mirror://gentoo/texlive-module-schule.doc-2016.tar.xz mirror://gentoo/texlive-module-sduthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-seuthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-seuthesix.doc-2016.tar.xz mirror://gentoo/texlive-module-soton.doc-2016.tar.xz mirror://gentoo/texlive-module-sphdthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-spie.doc-2016.tar.xz mirror://gentoo/texlive-module-sr-vorl.doc-2016.tar.xz mirror://gentoo/texlive-module-stellenbosch.doc-2016.tar.xz mirror://gentoo/texlive-module-suftesi.doc-2016.tar.xz mirror://gentoo/texlive-module-sugconf.doc-2016.tar.xz mirror://gentoo/texlive-module-tabriz-thesis.doc-2016.tar.xz mirror://gentoo/texlive-module-thesis-ekf.doc-2016.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.doc-2016.tar.xz mirror://gentoo/texlive-module-thuthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-toptesi.doc-2016.tar.xz mirror://gentoo/texlive-module-tudscr.doc-2016.tar.xz mirror://gentoo/texlive-module-tugboat.doc-2016.tar.xz mirror://gentoo/texlive-module-tugboat-plain.doc-2016.tar.xz mirror://gentoo/texlive-module-turabian.doc-2016.tar.xz mirror://gentoo/texlive-module-tui.doc-2016.tar.xz mirror://gentoo/texlive-module-uaclasses.doc-2016.tar.xz mirror://gentoo/texlive-module-uafthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.doc-2016.tar.xz mirror://gentoo/texlive-module-ucbthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-ucthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-uestcthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-uiucredborder.doc-2016.tar.xz mirror://gentoo/texlive-module-uiucthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-ulthese.doc-2016.tar.xz mirror://gentoo/texlive-module-umbclegislation.doc-2016.tar.xz mirror://gentoo/texlive-module-umthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-umich-thesis.doc-2016.tar.xz mirror://gentoo/texlive-module-unamth-template.doc-2016.tar.xz mirror://gentoo/texlive-module-unamthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-unswcover.doc-2016.tar.xz mirror://gentoo/texlive-module-uothesis.doc-2016.tar.xz mirror://gentoo/texlive-module-urcls.doc-2016.tar.xz mirror://gentoo/texlive-module-uowthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage.doc-2016.tar.xz mirror://gentoo/texlive-module-uspatent.doc-2016.tar.xz mirror://gentoo/texlive-module-ut-thesis.doc-2016.tar.xz mirror://gentoo/texlive-module-uwthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-vancouver.doc-2016.tar.xz mirror://gentoo/texlive-module-xduthesis.doc-2016.tar.xz mirror://gentoo/texlive-module-wsemclassic.doc-2016.tar.xz mirror://gentoo/texlive-module-xcookybooky.doc-2016.tar.xz mirror://gentoo/texlive-module-yathesis.doc-2016.tar.xz mirror://gentoo/texlive-module-york-thesis.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-IEEEconf.source-2016.tar.xz mirror://gentoo/texlive-module-acmart.source-2016.tar.xz mirror://gentoo/texlive-module-acmconf.source-2016.tar.xz mirror://gentoo/texlive-module-active-conf.source-2016.tar.xz mirror://gentoo/texlive-module-adfathesis.source-2016.tar.xz mirror://gentoo/texlive-module-afparticle.source-2016.tar.xz mirror://gentoo/texlive-module-aiaa.source-2016.tar.xz mirror://gentoo/texlive-module-aomart.source-2016.tar.xz mirror://gentoo/texlive-module-apa6.source-2016.tar.xz mirror://gentoo/texlive-module-apa6e.source-2016.tar.xz mirror://gentoo/texlive-module-articleingud.source-2016.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.source-2016.tar.xz mirror://gentoo/texlive-module-bangorexam.source-2016.tar.xz mirror://gentoo/texlive-module-bgteubner.source-2016.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.source-2016.tar.xz mirror://gentoo/texlive-module-confproc.source-2016.tar.xz mirror://gentoo/texlive-module-cquthesis.source-2016.tar.xz mirror://gentoo/texlive-module-dccpaper.source-2016.tar.xz mirror://gentoo/texlive-module-ebsthesis.source-2016.tar.xz mirror://gentoo/texlive-module-ejpecp.source-2016.tar.xz mirror://gentoo/texlive-module-ekaia.source-2016.tar.xz mirror://gentoo/texlive-module-elbioimp.source-2016.tar.xz mirror://gentoo/texlive-module-elsarticle.source-2016.tar.xz mirror://gentoo/texlive-module-elteikthesis.source-2016.tar.xz mirror://gentoo/texlive-module-emisa.source-2016.tar.xz mirror://gentoo/texlive-module-erdc.source-2016.tar.xz mirror://gentoo/texlive-module-estcpmm.source-2016.tar.xz mirror://gentoo/texlive-module-fbithesis.source-2016.tar.xz mirror://gentoo/texlive-module-fcltxdoc.source-2016.tar.xz mirror://gentoo/texlive-module-fei.source-2016.tar.xz mirror://gentoo/texlive-module-grant.source-2016.tar.xz mirror://gentoo/texlive-module-gsemthesis.source-2016.tar.xz mirror://gentoo/texlive-module-gzt.source-2016.tar.xz mirror://gentoo/texlive-module-hustthesis.source-2016.tar.xz mirror://gentoo/texlive-module-icsv.source-2016.tar.xz mirror://gentoo/texlive-module-ijmart.source-2016.tar.xz mirror://gentoo/texlive-module-imtekda.source-2016.tar.xz mirror://gentoo/texlive-module-jmlr.source-2016.tar.xz mirror://gentoo/texlive-module-kdgdocs.source-2016.tar.xz mirror://gentoo/texlive-module-kluwer.source-2016.tar.xz mirror://gentoo/texlive-module-lps.source-2016.tar.xz mirror://gentoo/texlive-module-matc3.source-2016.tar.xz mirror://gentoo/texlive-module-matc3mem.source-2016.tar.xz mirror://gentoo/texlive-module-mcmthesis.source-2016.tar.xz mirror://gentoo/texlive-module-mentis.source-2016.tar.xz mirror://gentoo/texlive-module-mugsthesis.source-2016.tar.xz mirror://gentoo/texlive-module-musuos.source-2016.tar.xz mirror://gentoo/texlive-module-mynsfc.source-2016.tar.xz mirror://gentoo/texlive-module-navydocs.source-2016.tar.xz mirror://gentoo/texlive-module-nddiss.source-2016.tar.xz mirror://gentoo/texlive-module-nwejm.source-2016.tar.xz mirror://gentoo/texlive-module-nostarch.source-2016.tar.xz mirror://gentoo/texlive-module-nrc.source-2016.tar.xz mirror://gentoo/texlive-module-philosophersimprint.source-2016.tar.xz mirror://gentoo/texlive-module-pittetd.source-2016.tar.xz mirror://gentoo/texlive-module-pracjourn.source-2016.tar.xz mirror://gentoo/texlive-module-proposal.source-2016.tar.xz mirror://gentoo/texlive-module-resphilosophica.source-2016.tar.xz mirror://gentoo/texlive-module-resumecls.source-2016.tar.xz mirror://gentoo/texlive-module-revtex.source-2016.tar.xz mirror://gentoo/texlive-module-revtex4.source-2016.tar.xz mirror://gentoo/texlive-module-ryethesis.source-2016.tar.xz mirror://gentoo/texlive-module-sageep.source-2016.tar.xz mirror://gentoo/texlive-module-scrjrnl.source-2016.tar.xz mirror://gentoo/texlive-module-schule.source-2016.tar.xz mirror://gentoo/texlive-module-sduthesis.source-2016.tar.xz mirror://gentoo/texlive-module-seuthesis.source-2016.tar.xz mirror://gentoo/texlive-module-seuthesix.source-2016.tar.xz mirror://gentoo/texlive-module-sr-vorl.source-2016.tar.xz mirror://gentoo/texlive-module-stellenbosch.source-2016.tar.xz mirror://gentoo/texlive-module-suftesi.source-2016.tar.xz mirror://gentoo/texlive-module-thesis-ekf.source-2016.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.source-2016.tar.xz mirror://gentoo/texlive-module-thuthesis.source-2016.tar.xz mirror://gentoo/texlive-module-toptesi.source-2016.tar.xz mirror://gentoo/texlive-module-tudscr.source-2016.tar.xz mirror://gentoo/texlive-module-tugboat.source-2016.tar.xz mirror://gentoo/texlive-module-uaclasses.source-2016.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.source-2016.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.source-2016.tar.xz mirror://gentoo/texlive-module-uiucredborder.source-2016.tar.xz mirror://gentoo/texlive-module-uiucthesis.source-2016.tar.xz mirror://gentoo/texlive-module-ulthese.source-2016.tar.xz mirror://gentoo/texlive-module-uothesis.source-2016.tar.xz mirror://gentoo/texlive-module-xduthesis.source-2016.tar.xz mirror://gentoo/texlive-module-wsemclassic.source-2016.tar.xz mirror://gentoo/texlive-module-xcookybooky.source-2016.tar.xz mirror://gentoo/texlive-module-yathesis.source-2016.tar.xz mirror://gentoo/texlive-module-york-thesis.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=7e673065510d0f60750c47caa709efbd
+_md5_=59a15bce629bcfa6ee80f8abe7ea7535
diff --git a/metadata/md5-cache/dev-texlive/texlive-xetex-2016 b/metadata/md5-cache/dev-texlive/texlive-xetex-2016
index 5baf67ae113d..6b329fae0717 100644
--- a/metadata/md5-cache/dev-texlive/texlive-xetex-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-xetex-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive XeTeX and packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=X source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2016 !=app-text/texlive-core-2007* >=dev-texlive/texlive-latexextra-2010 >=app-text/texlive-core-2010[xetex] >=dev-texlive/texlive-genericrecommended-2010 dev-texlive/texlive-mathscience !<dev-texlive/texlive-mathextra-2012 >=app-text/texlive-core-2016
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arabxetex-2016.tar.xz mirror://gentoo/texlive-module-awesomebox-2016.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi-2016.tar.xz mirror://gentoo/texlive-module-bidicontour-2016.tar.xz mirror://gentoo/texlive-module-bidipagegrid-2016.tar.xz mirror://gentoo/texlive-module-bidishadowtext-2016.tar.xz mirror://gentoo/texlive-module-bidipresentation-2016.tar.xz mirror://gentoo/texlive-module-fixlatvian-2016.tar.xz mirror://gentoo/texlive-module-font-change-xetex-2016.tar.xz mirror://gentoo/texlive-module-fontbook-2016.tar.xz mirror://gentoo/texlive-module-fontwrap-2016.tar.xz mirror://gentoo/texlive-module-interchar-2016.tar.xz mirror://gentoo/texlive-module-philokalia-2016.tar.xz mirror://gentoo/texlive-module-ptext-2016.tar.xz mirror://gentoo/texlive-module-quran-2016.tar.xz mirror://gentoo/texlive-module-realscripts-2016.tar.xz mirror://gentoo/texlive-module-ucharclasses-2016.tar.xz mirror://gentoo/texlive-module-unicode-bidi-2016.tar.xz mirror://gentoo/texlive-module-unisugar-2016.tar.xz mirror://gentoo/texlive-module-xebaposter-2016.tar.xz mirror://gentoo/texlive-module-xecjk-2016.tar.xz mirror://gentoo/texlive-module-xecolor-2016.tar.xz mirror://gentoo/texlive-module-xecyr-2016.tar.xz mirror://gentoo/texlive-module-xeindex-2016.tar.xz mirror://gentoo/texlive-module-xesearch-2016.tar.xz mirror://gentoo/texlive-module-xespotcolor-2016.tar.xz mirror://gentoo/texlive-module-xetex-2016.tar.xz mirror://gentoo/texlive-module-xetex-itrans-2016.tar.xz mirror://gentoo/texlive-module-xetex-pstricks-2016.tar.xz mirror://gentoo/texlive-module-xetex-tibetan-2016.tar.xz mirror://gentoo/texlive-module-xetexconfig-2016.tar.xz mirror://gentoo/texlive-module-xetexfontinfo-2016.tar.xz mirror://gentoo/texlive-module-xetexko-2016.tar.xz mirror://gentoo/texlive-module-xevlna-2016.tar.xz mirror://gentoo/texlive-module-collection-xetex-2016.tar.xz doc? ( mirror://gentoo/texlive-module-arabxetex.doc-2016.tar.xz mirror://gentoo/texlive-module-awesomebox.doc-2016.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi.doc-2016.tar.xz mirror://gentoo/texlive-module-bidicontour.doc-2016.tar.xz mirror://gentoo/texlive-module-bidipagegrid.doc-2016.tar.xz mirror://gentoo/texlive-module-bidishadowtext.doc-2016.tar.xz mirror://gentoo/texlive-module-bidipresentation.doc-2016.tar.xz mirror://gentoo/texlive-module-fixlatvian.doc-2016.tar.xz mirror://gentoo/texlive-module-font-change-xetex.doc-2016.tar.xz mirror://gentoo/texlive-module-fontbook.doc-2016.tar.xz mirror://gentoo/texlive-module-fontwrap.doc-2016.tar.xz mirror://gentoo/texlive-module-interchar.doc-2016.tar.xz mirror://gentoo/texlive-module-philokalia.doc-2016.tar.xz mirror://gentoo/texlive-module-ptext.doc-2016.tar.xz mirror://gentoo/texlive-module-quran.doc-2016.tar.xz mirror://gentoo/texlive-module-realscripts.doc-2016.tar.xz mirror://gentoo/texlive-module-ucharclasses.doc-2016.tar.xz mirror://gentoo/texlive-module-unicode-bidi.doc-2016.tar.xz mirror://gentoo/texlive-module-unisugar.doc-2016.tar.xz mirror://gentoo/texlive-module-xebaposter.doc-2016.tar.xz mirror://gentoo/texlive-module-xecjk.doc-2016.tar.xz mirror://gentoo/texlive-module-xecolor.doc-2016.tar.xz mirror://gentoo/texlive-module-xecyr.doc-2016.tar.xz mirror://gentoo/texlive-module-xeindex.doc-2016.tar.xz mirror://gentoo/texlive-module-xesearch.doc-2016.tar.xz mirror://gentoo/texlive-module-xespotcolor.doc-2016.tar.xz mirror://gentoo/texlive-module-xetex.doc-2016.tar.xz mirror://gentoo/texlive-module-xetex-itrans.doc-2016.tar.xz mirror://gentoo/texlive-module-xetex-pstricks.doc-2016.tar.xz mirror://gentoo/texlive-module-xetex-tibetan.doc-2016.tar.xz mirror://gentoo/texlive-module-xetexfontinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-xetexko.doc-2016.tar.xz mirror://gentoo/texlive-module-xevlna.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-arabxetex.source-2016.tar.xz mirror://gentoo/texlive-module-fixlatvian.source-2016.tar.xz mirror://gentoo/texlive-module-fontbook.source-2016.tar.xz mirror://gentoo/texlive-module-philokalia.source-2016.tar.xz mirror://gentoo/texlive-module-realscripts.source-2016.tar.xz mirror://gentoo/texlive-module-xecjk.source-2016.tar.xz mirror://gentoo/texlive-module-xespotcolor.source-2016.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=8c6c4dd8ac38430230573f2a395bc56d
+_md5_=f70579aa89db69c6c4f9dd5c0d8eedd9
diff --git a/metadata/md5-cache/dev-util/gengetopt-2.22.6 b/metadata/md5-cache/dev-util/gengetopt-2.22.6
index 5b44f605af10..b00711ea68e2 100644
--- a/metadata/md5-cache/dev-util/gengetopt-2.22.6
+++ b/metadata/md5-cache/dev-util/gengetopt-2.22.6
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=A tool to write command line option parsing code for C programs
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gengetopt/
-KEYWORDS=~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
+KEYWORDS=amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gengetopt/gengetopt-2.22.6.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=56e5e37e24fdbccc752df5c1a09dabdf
+_md5_=6e56afede3e1e01515c39baa2c8879f9
diff --git a/metadata/md5-cache/dev-util/strace-4.16 b/metadata/md5-cache/dev-util/strace-4.16
index ba75ed24b138..e144307d28d0 100644
--- a/metadata/md5-cache/dev-util/strace-4.16
+++ b/metadata/md5-cache/dev-util/strace-4.16
@@ -4,10 +4,10 @@ DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/strace/
 IUSE=aio perl static unwind
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=mirror://sourceforge/strace/strace-4.16.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=7ed7830c5e39799f5022001a08127dda
+_md5_=aa18cf2c2542fd217bae7c7e9e990b12
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.2 b/metadata/md5-cache/dev-vcs/mercurial-4.2
index ea96c80664b2..ca8a8cd4a442 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable distributed SCM
 EAPI=6
 HOMEPAGE=https://www.mercurial-scm.org/
 IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 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=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3afdc87dcbcfceea0e95273fb5029eab
+_md5_=526be75a42086502d8d31531476fc23e
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-3.8.4 b/metadata/md5-cache/dev-vcs/tortoisehg-3.8.4
index 1083c83e7aea..da16260b91d1 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-3.8.4
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-3.8.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-3.8.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=537628e745432131de4b4926d76f9dbf
+_md5_=6a6ebc1b3e0196c28638ee31c9cc58fe
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.1.3 b/metadata/md5-cache/dev-vcs/tortoisehg-4.1.3
index 67b426edea1a..593d05277446 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-4.1.3
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.1.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.1.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ecd2e2d75892188d947b4e0867901a98
+_md5_=f2797f7f554815d8c19b7749920fb7ed
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.2 b/metadata/md5-cache/dev-vcs/tortoisehg-4.2
index 3fa90fdb86b8..ef5ce0b2d40d 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-4.2
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Set of graphical tools for Mercurial
 EAPI=6
 HOMEPAGE=https://tortoisehg.bitbucket.org
 IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/mercurial-4.1 <dev-vcs/mercurial-4.3 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qscintilla-python[qt4(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9e0ee8f0d897768dcb8c9521b74e87fc
+_md5_=99306a485d2a1724303ac088b78ea9c2
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.2.1 b/metadata/md5-cache/dev-vcs/tortoisehg-4.2.1
index 62a5d3818603..e80141ef9574 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-4.2.1
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.2.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9e0ee8f0d897768dcb8c9521b74e87fc
+_md5_=9c22b1ae1541525521a09c7cd9ca410f
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index bc0f5d7d242b..05e5af178c95 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-9999
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-vcs/mercurial dev-python/iniparse[python_targets_python2_7(-)?,-pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=942dc3e9dc22cdc79cb1a2a368ff6c48
+_md5_=f1253363e850e49fc0061c8fb32a9a68
diff --git a/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610 b/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610
new file mode 100644
index 000000000000..7e46f00f2fb2
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Powerful batch file renamer
+EAPI=6
+HOMEPAGE=http://www.krename.net/
+IUSE=exif pdf taglib truetype debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) !kde-misc/krename:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.6.1:5
+SLOT=5
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/krename-4.0.9_p20170610.tar.xz
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	475744bd521894645f9df9ade627e4c1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=730a1d44a8de27a67f9689e113d542b4
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.10.1 b/metadata/md5-cache/kde-plasma/kwin-5.10.1
index c139d3d987dd..c282998f97d7 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.10.1
+++ b/metadata/md5-cache/kde-plasma/kwin-5.10.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.1/kwin-5.10.1.tar.xz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	475744bd521894645f9df9ade627e4c1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ad7f2fc47d19f6d45cabb509aabcb8c0
+_md5_=09c5c7625eee919941e6111cd1e2b0c6
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.8.7 b/metadata/md5-cache/kde-plasma/kwin-5.8.7
index 6f1a8dd1b260..1b3fd075d647 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.8.7
+++ b/metadata/md5-cache/kde-plasma/kwin-5.8.7
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.7/kwin-5.8.7.tar.xz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	475744bd521894645f9df9ade627e4c1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=969d55b8eb3d87d42acf34599adff3c1
+_md5_=1bf4eecb9dc17f4454c0d610daf93fec
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.9.5 b/metadata/md5-cache/kde-plasma/kwin-5.9.5
index 501473043e07..95a602feccd4 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.9.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.9.5
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.5/kwin-5.9.5.tar.xz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	475744bd521894645f9df9ade627e4c1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4322c87cf5cf43c6a8b09d1f3f08268e
+_md5_=befde6183ff739e38b9e4b3480a199b2
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.1
index 8133a51e1e41..853c25875db2 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=+calendar geolocation gps prison qalculate +semantic-desktop test debug +handbook test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.10.1:5 >=kde-plasma/kwin-5.10.1:5 >=kde-plasma/libksysguard-5.10.1:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) >=kde-frameworks/kded-5.34.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.10.1:5 >=kde-plasma/ksysguard-5.10.1:5 >=kde-plasma/milou-5.10.1:5 >=kde-plasma/plasma-integration-5.10.1:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 !x11-misc/notification-daemon >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.10.1:5 >=kde-plasma/kwin-5.10.1:5 >=kde-plasma/libksysguard-5.10.1:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) >=kde-frameworks/kded-5.34.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.10.1:5 >=kde-plasma/ksysguard-5.10.1:5 >=kde-plasma/milou-5.10.1:5 >=kde-plasma/plasma-integration-5.10.1:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.1/plasma-workspace-5.10.1.tar.xz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	475744bd521894645f9df9ade627e4c1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9afcda621e9edab008305ff103272b39
+_md5_=94858de8ef82b1fb057f209999f331f9
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1-r1
deleted file mode 100644
index 34d0f4898863..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.33.0:5 >=kde-frameworks/kauth-5.33.0:5 >=kde-frameworks/kbookmarks-5.33.0:5 >=kde-frameworks/kcmutils-5.33.0:5 >=kde-frameworks/kcompletion-5.33.0:5 >=kde-frameworks/kconfig-5.33.0:5 >=kde-frameworks/kconfigwidgets-5.33.0:5 >=kde-frameworks/kcoreaddons-5.33.0:5 >=kde-frameworks/kcrash-5.33.0:5 >=kde-frameworks/kdbusaddons-5.33.0:5 >=kde-frameworks/kdeclarative-5.33.0:5 >=kde-frameworks/kdelibs4support-5.33.0:5 >=kde-frameworks/kdesu-5.33.0:5 >=kde-frameworks/kglobalaccel-5.33.0:5 >=kde-frameworks/kguiaddons-5.33.0:5 >=kde-frameworks/ki18n-5.33.0:5 >=kde-frameworks/kiconthemes-5.33.0:5 >=kde-frameworks/kidletime-5.33.0:5 >=kde-frameworks/kio-5.33.0:5 >=kde-frameworks/kitemmodels-5.33.0:5 >=kde-frameworks/kitemviews-5.33.0:5 >=kde-frameworks/kjobwidgets-5.33.0:5 >=kde-frameworks/kjs-5.33.0:5 >=kde-frameworks/kjsembed-5.33.0:5 >=kde-frameworks/knewstuff-5.33.0:5 >=kde-frameworks/knotifications-5.33.0:5 >=kde-frameworks/knotifyconfig-5.33.0:5 >=kde-frameworks/kpackage-5.33.0:5 >=kde-frameworks/krunner-5.33.0:5 >=kde-frameworks/kservice-5.33.0:5 >=kde-frameworks/ktexteditor-5.33.0:5 >=kde-frameworks/ktextwidgets-5.33.0:5 >=kde-frameworks/kwallet-5.33.0:5 >=kde-frameworks/kwayland-5.33.0:5 >=kde-frameworks/kwidgetsaddons-5.33.0:5 >=kde-frameworks/kwindowsystem-5.33.0:5 >=kde-frameworks/kxmlgui-5.33.0:5 >=kde-frameworks/kxmlrpcclient-5.33.0:5 >=kde-frameworks/plasma-5.33.0:5 >=kde-frameworks/solid-5.33.0:5 >=kde-plasma/kscreenlocker-5.9.5:5 >=kde-plasma/kwin-5.9.5:5 >=kde-plasma/libksysguard-5.9.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.33.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.33.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.33.0:5 ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.33.0:5 handbook? ( >=kde-frameworks/kdoctools-5.33.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+calendar geolocation gps prison qalculate +semantic-desktop test debug +handbook test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.33.0:5 >=kde-frameworks/kauth-5.33.0:5 >=kde-frameworks/kbookmarks-5.33.0:5 >=kde-frameworks/kcmutils-5.33.0:5 >=kde-frameworks/kcompletion-5.33.0:5 >=kde-frameworks/kconfig-5.33.0:5 >=kde-frameworks/kconfigwidgets-5.33.0:5 >=kde-frameworks/kcoreaddons-5.33.0:5 >=kde-frameworks/kcrash-5.33.0:5 >=kde-frameworks/kdbusaddons-5.33.0:5 >=kde-frameworks/kdeclarative-5.33.0:5 >=kde-frameworks/kdelibs4support-5.33.0:5 >=kde-frameworks/kdesu-5.33.0:5 >=kde-frameworks/kglobalaccel-5.33.0:5 >=kde-frameworks/kguiaddons-5.33.0:5 >=kde-frameworks/ki18n-5.33.0:5 >=kde-frameworks/kiconthemes-5.33.0:5 >=kde-frameworks/kidletime-5.33.0:5 >=kde-frameworks/kio-5.33.0:5 >=kde-frameworks/kitemmodels-5.33.0:5 >=kde-frameworks/kitemviews-5.33.0:5 >=kde-frameworks/kjobwidgets-5.33.0:5 >=kde-frameworks/kjs-5.33.0:5 >=kde-frameworks/kjsembed-5.33.0:5 >=kde-frameworks/knewstuff-5.33.0:5 >=kde-frameworks/knotifications-5.33.0:5 >=kde-frameworks/knotifyconfig-5.33.0:5 >=kde-frameworks/kpackage-5.33.0:5 >=kde-frameworks/krunner-5.33.0:5 >=kde-frameworks/kservice-5.33.0:5 >=kde-frameworks/ktexteditor-5.33.0:5 >=kde-frameworks/ktextwidgets-5.33.0:5 >=kde-frameworks/kwallet-5.33.0:5 >=kde-frameworks/kwayland-5.33.0:5 >=kde-frameworks/kwidgetsaddons-5.33.0:5 >=kde-frameworks/kwindowsystem-5.33.0:5 >=kde-frameworks/kxmlgui-5.33.0:5 >=kde-frameworks/kxmlrpcclient-5.33.0:5 >=kde-frameworks/plasma-5.33.0:5 >=kde-frameworks/solid-5.33.0:5 >=kde-plasma/kscreenlocker-5.9.5:5 >=kde-plasma/kwin-5.9.5:5 >=kde-plasma/libksysguard-5.9.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.33.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.33.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.33.0:5 ) >=kde-frameworks/kded-5.33.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.9.5:5 >=kde-plasma/ksysguard-5.9.5:5 >=kde-plasma/milou-5.9.5:5 >=kde-plasma/plasma-integration-5.9.5:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.9.5/plasma-workspace-5.9.5.1.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	475744bd521894645f9df9ade627e4c1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=7ab128e933b9713ab6585490d4907cc0
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1-r2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1-r2
new file mode 100644
index 000000000000..79e240eeee21
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.9.5.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.9.5:5 >=kde-plasma/kwin-5.9.5:5 >=kde-plasma/libksysguard-5.9.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.34.0:5 handbook? ( >=kde-frameworks/kdoctools-5.34.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma workspace
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+calendar geolocation gps prison qalculate +semantic-desktop test debug +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.34.0:5 >=kde-frameworks/kauth-5.34.0:5 >=kde-frameworks/kbookmarks-5.34.0:5 >=kde-frameworks/kcmutils-5.34.0:5 >=kde-frameworks/kcompletion-5.34.0:5 >=kde-frameworks/kconfig-5.34.0:5 >=kde-frameworks/kconfigwidgets-5.34.0:5 >=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kcrash-5.34.0:5 >=kde-frameworks/kdbusaddons-5.34.0:5 >=kde-frameworks/kdeclarative-5.34.0:5 >=kde-frameworks/kdelibs4support-5.34.0:5 >=kde-frameworks/kdesu-5.34.0:5 >=kde-frameworks/kglobalaccel-5.34.0:5 >=kde-frameworks/kguiaddons-5.34.0:5 >=kde-frameworks/ki18n-5.34.0:5 >=kde-frameworks/kiconthemes-5.34.0:5 >=kde-frameworks/kidletime-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=kde-frameworks/kitemmodels-5.34.0:5 >=kde-frameworks/kitemviews-5.34.0:5 >=kde-frameworks/kjobwidgets-5.34.0:5 >=kde-frameworks/kjs-5.34.0:5 >=kde-frameworks/kjsembed-5.34.0:5 >=kde-frameworks/knewstuff-5.34.0:5 >=kde-frameworks/knotifications-5.34.0:5 >=kde-frameworks/knotifyconfig-5.34.0:5 >=kde-frameworks/kpackage-5.34.0:5 >=kde-frameworks/krunner-5.34.0:5 >=kde-frameworks/kservice-5.34.0:5 >=kde-frameworks/ktexteditor-5.34.0:5 >=kde-frameworks/ktextwidgets-5.34.0:5 >=kde-frameworks/kwallet-5.34.0:5 >=kde-frameworks/kwayland-5.34.0:5 >=kde-frameworks/kwidgetsaddons-5.34.0:5 >=kde-frameworks/kwindowsystem-5.34.0:5 >=kde-frameworks/kxmlgui-5.34.0:5 >=kde-frameworks/kxmlrpcclient-5.34.0:5 >=kde-frameworks/plasma-5.34.0:5 >=kde-frameworks/solid-5.34.0:5 >=kde-plasma/kscreenlocker-5.9.5:5 >=kde-plasma/kwin-5.9.5:5 >=kde-plasma/libksysguard-5.9.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.34.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.34.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.34.0:5 ) >=kde-frameworks/kded-5.34.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.9.5:5 >=kde-plasma/ksysguard-5.9.5:5 >=kde-plasma/milou-5.9.5:5 >=kde-plasma/plasma-integration-5.9.5:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.9.5/plasma-workspace-5.9.5.1.tar.xz
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	036029b32cabf954eb0a9a419f8ae73c	kde5-functions	475744bd521894645f9df9ade627e4c1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=31fbc22864666ee481726c1272cd424b
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.6.6 b/metadata/md5-cache/mail-mta/msmtp-1.6.6
index 0b8584cb4a2a..69c36bfbf895 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.6.6
+++ b/metadata/md5-cache/mail-mta/msmtp-1.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
 EAPI=6
 HOMEPAGE=http://msmtp.sourceforge.net/
 IUSE=doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax
-KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=idn? ( net-dns/libidn ) libsecret? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/msmtp/msmtp-1.6.6.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4d5d7e747d2ebfd78d57483492f93287
+_md5_=2eec859980ebc4796ee90e1fdb94597d
diff --git a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre062 b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre062
index aca45068a7e7..d5e58a7c9879 100644
--- a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre062
+++ b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre062
@@ -4,10 +4,10 @@ DESCRIPTION=M+ Japanese outline fonts
 EAPI=6
 HOMEPAGE=http://mplus-fonts.osdn.jp/ http://ossipedia.ipa.go.jp/ipafont/
 IUSE=ipafont X
-KEYWORDS=amd64 hppa ~ia64 ppc x86 ~ppc-macos ~x86-macos
+KEYWORDS=amd64 hppa ia64 ppc x86 ~ppc-macos ~x86-macos
 LICENSE=mplus-fonts ipafont? ( IPAfont )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/mplus-fonts/62344/mplus-TESTFLIGHT-062.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=f95b8d0f0e58295e571cd032ca740760
+_md5_=9965130cb1a5aed25b87172ea5fceea4
diff --git a/metadata/md5-cache/media-fonts/unifont-9.0.06 b/metadata/md5-cache/media-fonts/unifont-9.0.06
index 64c301803148..ff05b3c56eb0 100644
--- a/metadata/md5-cache/media-fonts/unifont-9.0.06
+++ b/metadata/md5-cache/media-fonts/unifont-9.0.06
@@ -4,10 +4,10 @@ DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
 EAPI=6
 HOMEPAGE=http://unifoundry.com/
 IUSE=fontforge utils X
-KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-9.0.06/unifont-9.0.06.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4bcc218da3fd459bfbc4fb3a125605aa
+_md5_=06516523db1b0163b6c4e2128d17c25d
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.22 b/metadata/md5-cache/media-gfx/gimp-2.8.22
index 6b992562d55c..ad45a78da24e 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.8.22
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.22
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Image Manipulation Program
 EAPI=5
 HOMEPAGE=http://www.gimp.org/
 IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm linguas_am linguas_ar linguas_ast linguas_az linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_dz linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mk linguas_ml linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_tt linguas_uk linguas_vi linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW test debug python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/pygtk-2.10.4: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(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.8/gimp-2.8.22.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2be059468fc9aae5cc1568919149c7a4
+_md5_=a8fa8ff6f9d6125c094b9263a27189f2
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.8-r1 b/metadata/md5-cache/media-gfx/graphite2-1.3.8-r1
index ca7d19a40b6c..83d69ef3ddad 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.8-r1
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing rendering capabilities for complex non-Roman writi
 EAPI=6
 HOMEPAGE=http://graphite.sil.org/
 IUSE=perl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.8.tgz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cc8f9ba10fbfce3f9e4ef24d82f25780
+_md5_=4dcef274de68993b1fa1b33ef8739e20
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.8.6 b/metadata/md5-cache/media-gfx/imagemagick-6.9.8.6
index 6382c5d2fe1d..99684e63fc0e 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.8.6
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.8.6
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=http://www.imagemagick.org/
 IUSE=autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/6.9.8.6
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.8-6.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b1087c202ee8a7418603d9c3395fdd7d
+_md5_=a30ba180e5dd244b9eed1f14ab45c99a
diff --git a/metadata/md5-cache/media-gfx/potrace-1.14 b/metadata/md5-cache/media-gfx/potrace-1.14
index f3ed928d277d..b506c1820737 100644
--- a/metadata/md5-cache/media-gfx/potrace-1.14
+++ b/metadata/md5-cache/media-gfx/potrace-1.14
@@ -4,10 +4,10 @@ DESCRIPTION=Transforming bitmaps into vector graphics
 EAPI=5
 HOMEPAGE=http://potrace.sourceforge.net/
 IUSE=metric static-libs
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://potrace.sourceforge.net/download/1.14/potrace-1.14.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4bc4d264ebe50f85880ac258e1c12051
+_md5_=cbe82037f856a74c7c1e16446e2a765d
diff --git a/metadata/md5-cache/media-libs/glew-1.13.0 b/metadata/md5-cache/media-libs/glew-1.13.0
index be4d04a9671a..2db8d6e83c02 100644
--- a/metadata/md5-cache/media-libs/glew-1.13.0
+++ b/metadata/md5-cache/media-libs/glew-1.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenGL Extension Wrangler Library
 EAPI=6
 HOMEPAGE=http://glew.sourceforge.net/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD MIT
 RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 SLOT=0/1.13
 SRC_URI=mirror://sourceforge/glew/glew-1.13.0.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ac371db66a23d0db00dd193af140f81b
+_md5_=7b1b48d586a99f7d95e7f5fdb8100954
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.4.5 b/metadata/md5-cache/media-libs/harfbuzz-1.4.5
index 08494ce57c7c..2c63ed7ecd13 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.4.5
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.4.5
@@ -4,11 +4,11 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.4.5.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8c4eff830460b7b935b7e0905428ea93
+_md5_=e6cc7675d0d50202b3db08f0db08d13c
diff --git a/metadata/md5-cache/media-libs/jbig2dec-0.13-r3 b/metadata/md5-cache/media-libs/jbig2dec-0.13-r3
new file mode 100644
index 000000000000..c41bb0ce925e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/jbig2dec-0.13-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=png? ( media-libs/libpng:0= ) test? ( app-arch/unzip )
+DESCRIPTION=A decoder implementation of the JBIG2 image compression format
+EAPI=6
+HOMEPAGE=http://ghostscript.com/jbig2dec.html
+IUSE=png static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+LICENSE=AGPL-3
+RDEPEND=png? ( media-libs/libpng:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://downloads.ghostscript.com/public/jbig2dec/jbig2dec-0.13.tar.gz test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
+_md5_=eb6b9e709a08cc034eb74c551418231e
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.4.2 b/metadata/md5-cache/media-libs/libepoxy-1.4.2
index c18f5280e916..aa7724de6059 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.4.2
+++ b/metadata/md5-cache/media-libs/libepoxy-1.4.2
@@ -4,9 +4,9 @@ DESCRIPTION=Epoxy is a library for handling OpenGL function pointer management f
 EAPI=6
 HOMEPAGE=https://github.com/anholt/libepoxy
 IUSE=test +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/1.4.2.tar.gz -> libepoxy-1.4.2.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=2f738be51073d29c6df646aecf006887
+_md5_=d958842b3f03ad73713538d17d4a31c0
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.12 b/metadata/md5-cache/media-libs/libmtp-1.1.12
index afabc371d425..5bc26f06f096 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.12
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.12
@@ -4,10 +4,10 @@ DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP)
 EAPI=6
 HOMEPAGE=http://libmtp.sourceforge.net/
 IUSE=+crypt doc examples static-libs
-KEYWORDS=amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.12.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=1dfa307f8ac5be454163d17793c21505
+_md5_=25fa9194c1a9b4e7ff221bd9b1e02aac
diff --git a/metadata/md5-cache/media-libs/libsixel-1.7.3 b/metadata/md5-cache/media-libs/libsixel-1.7.3
index 7d8cc6b2a3d8..acbe9aa6b94e 100644
--- a/metadata/md5-cache/media-libs/libsixel-1.7.3
+++ b/metadata/md5-cache/media-libs/libsixel-1.7.3
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight, fast implementation of DEC SIXEL graphics codec
 EAPI=6
 HOMEPAGE=https://github.com/saitoha/libsixel
 IUSE=curl gd gtk jpeg png
-KEYWORDS=amd64 ~ia64 x86
+KEYWORDS=amd64 ia64 x86
 LICENSE=MIT public-domain
 RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 )
 SLOT=0
 SRC_URI=https://github.com/saitoha/libsixel/archive/v1.7.3.tar.gz -> libsixel-1.7.3.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=b34696e93c2ee098061069e7fcec4dff
+_md5_=69e4d9e1855df2c2a01fe10f113e70a7
diff --git a/metadata/md5-cache/media-libs/mesa-17.0.6 b/metadata/md5-cache/media-libs/mesa-17.0.6
index 17c332c94557..50cb24bf2a5c 100644
--- a/metadata/md5-cache/media-libs/mesa-17.0.6
+++ b/metadata/md5-cache/media-libs/mesa-17.0.6
@@ -4,7 +4,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=6
 HOMEPAGE=https://www.mesa3d.org/
 IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_imx video_cards_nouveau video_cards_vc4 video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[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(-)?] llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] vulkan? ( || ( sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.6.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf: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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.6.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.74[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.74[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.74[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.74[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.74[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.74[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.74[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.74[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.74[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.74[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.74[video_cards_amdgpu] )
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.0.6.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=e87e6f63bb7ced9d704a828addcd5bfd
+_md5_=84f864e55a9e01f87c45321a69b0dbc5
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.8 b/metadata/md5-cache/media-libs/tiff-4.0.8
index 8dd087a78730..55f69ec637a6 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.8
+++ b/metadata/md5-cache/media-libs/tiff-4.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Tag Image File Format (TIFF) library
 EAPI=6
 HOMEPAGE=http://libtiff.maptools.org
 IUSE=+cxx jbig jpeg lzma static-libs test 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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=libtiff
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test? ( jpeg )
 SLOT=0
 SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.8.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.8.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=d351d01899eb626559082f367f3628d9
+_md5_=feb6b6a01ac999673cbc47bdd49b2371
diff --git a/metadata/md5-cache/media-sound/gogglesmm-1.1.1 b/metadata/md5-cache/media-sound/gogglesmm-1.1.9
similarity index 92%
rename from metadata/md5-cache/media-sound/gogglesmm-1.1.1
rename to metadata/md5-cache/media-sound/gogglesmm-1.1.9
index b13808262020..0136e82d2c8c 100644
--- a/metadata/md5-cache/media-sound/gogglesmm-1.1.1
+++ b/metadata/md5-cache/media-sound/gogglesmm-1.1.9
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/fox:= x11-libs/libSM x11-libs/libICE dev-db/sqlite media-libs/taglib dev-libs/expat dev-libs/libgcrypt:= dbus? ( sys-apps/dbus ) flac? ( media-libs/flac ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) aac? ( media-libs/faad2 ) pulseaudio? ( media-sound/pulseaudio ) opengl? ( media-libs/libepoxy virtual/glu )
 SLOT=0
-SRC_URI=https://github.com/gogglesmm/gogglesmm/archive/1.1.1.tar.gz -> gogglesmm-1.1.1.tar.gz
+SRC_URI=https://github.com/gogglesmm/gogglesmm/archive/1.1.9.tar.gz -> gogglesmm-1.1.9.tar.gz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=829ad21e7df870d7becb6241f1d7221e
+_md5_=d4558a5dd81f470c65b36a1765660d4d
diff --git a/metadata/md5-cache/media-sound/mpg123-1.24.0 b/metadata/md5-cache/media-sound/mpg123-1.24.0
index 0cba9980eaf8..f4e2a1dacbec 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.24.0
+++ b/metadata/md5-cache/media-sound/mpg123-1.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=6
 HOMEPAGE=http://www.mpg123.org/
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.24.0.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=bcb86ac501db09c1c2c6c726fac03e3e
+_md5_=05283cec6d6fead55c1ce035e1c595ea
diff --git a/metadata/md5-cache/net-analyzer/masscan-1.0.3-r1 b/metadata/md5-cache/net-analyzer/masscan-1.0.4
similarity index 69%
rename from metadata/md5-cache/net-analyzer/masscan-1.0.3-r1
rename to metadata/md5-cache/net-analyzer/masscan-1.0.4
index 93a85e5658b2..faeb341b2994 100644
--- a/metadata/md5-cache/net-analyzer/masscan-1.0.3-r1
+++ b/metadata/md5-cache/net-analyzer/masscan-1.0.4
@@ -1,12 +1,11 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap
+DEFINED_PHASES=install prepare
 DESCRIPTION=Mass IP port scanner
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/robertdavidgraham/masscan
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=net-libs/libpcap
 SLOT=0
-SRC_URI=https://github.com/robertdavidgraham/masscan/archive/1.0.3.tar.gz -> masscan-1.0.3.tar.gz
+SRC_URI=https://github.com/robertdavidgraham/masscan/archive/1.0.4.tar.gz -> masscan-1.0.4.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=439aa0293f4c9ecee8d5eb7c8fa1e9e0
+_md5_=bb34bccb095b6d3573a4d5f3dc3a553b
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.4 b/metadata/md5-cache/net-analyzer/netselect-0.4
new file mode 100644
index 000000000000..12d8f1ecbc86
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netselect-0.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Ultrafast implementation of ping
+EAPI=6
+HOMEPAGE=http://apenwarr.ca/netselect/
+IUSE=ipv6
+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 ~x86-macos
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=b683a72cd2358611d69818b0b472acfb
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.40 b/metadata/md5-cache/net-analyzer/nmap-7.40
index fca338e96c2e..1f2ddbbc4ec9 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.40
+++ b/metadata/md5-cache/net-analyzer/nmap-7.40
@@ -4,11 +4,11 @@ DESCRIPTION=A utility for network discovery and security auditing
 EAPI=6
 HOMEPAGE=http://nmap.org/
 IUSE=ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap linguas_de linguas_fr linguas_hi linguas_hr linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_zh python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) ndiff? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 REQUIRED_USE=system-lua? ( nse ) ndiff? ( python_targets_python2_7 ) zenmap? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://nmap.org/dist/nmap-7.40.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=a7ee9d8f0feb7c27212f6e9861f54dcf
+_md5_=6cf0d564bd20368ef10d9f16219d91fa
diff --git a/metadata/md5-cache/net-dns/bind-9.10.5 b/metadata/md5-cache/net-dns/bind-9.10.5
index 43cffff99314..a512e94c43d8 100644
--- a/metadata/md5-cache/net-dns/bind-9.10.5
+++ b/metadata/md5-cache/net-dns/bind-9.10.5
@@ -4,7 +4,7 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=berkdb +caps dlz doc fetchlimit filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 json ldap libressl mysql nslint odbc postgres python rpz seccomp selinux sit ssl static-libs +threads urandom xml python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 ISC BSD BSD-2 HPND JNIC openssl
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) python? ( || ( python_targets_python2_7 python_targets_python3_4 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.10.5/bind-9.10.5.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=46ffe82acb3a748f66efe9a4f8fc6112
+_md5_=316d3eb7abb072e2f6f27282e2b394db
diff --git a/metadata/md5-cache/net-dns/bind-9.11.0_p5 b/metadata/md5-cache/net-dns/bind-9.11.0_p5
index 209629c5f932..dc576376abb6 100644
--- a/metadata/md5-cache/net-dns/bind-9.11.0_p5
+++ b/metadata/md5-cache/net-dns/bind-9.11.0_p5
@@ -4,7 +4,7 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml +zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) dnstap? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.11.0-P5/bind-9.11.0-P5.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=06d1955987febafa80156371870d3b9c
+_md5_=a02780942df0867caa1dd17e9c88d736
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.10.5 b/metadata/md5-cache/net-dns/bind-tools-9.10.5
index 7933ff7981f6..62bcb29ffd01 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.10.5
+++ b/metadata/md5-cache/net-dns/bind-tools-9.10.5
@@ -4,7 +4,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.10.5/bind-9.10.5.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=8863bd4ae10360361da109a17eb320b9
+_md5_=1d3f63139e94b40efecaeb75dfbe965d
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.11.0_p5 b/metadata/md5-cache/net-dns/bind-tools-9.11.0_p5
index 6fd9caa08688..31cebef90013 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.11.0_p5
+++ b/metadata/md5-cache/net-dns/bind-tools-9.11.0_p5
@@ -4,7 +4,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.11.0-P5/bind-9.11.0-P5.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=69ffc01562b86793a07b496f16c51f13
+_md5_=1f473c65e14fdca4d808e0cef918fe59
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
index 820e3000b61d..63b9a3b937e1 100644
--- a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
@@ -4,9 +4,9 @@ DESCRIPTION=A wrapper for DNS name resolving or DNS faking
 EAPI=6
 HOMEPAGE=https://cwrap.org/resolv_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ppc64 x86
+KEYWORDS=alpha amd64 ~arm ia64 ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.5.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4c571f2401a8e97460ebba1dd66a7c78
+_md5_=fb132936dbaabc0fdf3f2b3ffb3fa56d
diff --git a/metadata/md5-cache/net-dns/unbound-1.6.2 b/metadata/md5-cache/net-dns/unbound-1.6.2
new file mode 100644
index 000000000000..c5aa6adc963a
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21: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-2.2.4: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/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)] ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=5
+HOMEPAGE=http://unbound.net/
+IUSE=debug dnscrypt dnstap +ecdsa gost libressl python selinux static-libs systemd test 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 python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21: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-2.2.4: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/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)] ) selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://unbound.net/downloads/unbound-1.6.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=f02ecaaa085f895dc8f347faf75b13a7
diff --git a/metadata/md5-cache/net-fs/samba-4.5.10 b/metadata/md5-cache/net-fs/samba-4.5.10
index c8965a155ec9..e2301748f740 100644
--- a/metadata/md5-cache/net-fs/samba-4.5.10
+++ b/metadata/md5-cache/net-fs/samba-4.5.10
@@ -4,11 +4,11 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=http://www.samba.org/
 IUSE=acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ppc64 x86
+KEYWORDS=alpha amd64 ~arm ia64 ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[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(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-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(-)?] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.5.10.tar.gz https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=a7710147afd6782f117e87fef2179586
+_md5_=83adea6e5ad0a55cc6f764445b59142b
diff --git a/metadata/md5-cache/net-libs/c-client-2007f-r6 b/metadata/md5-cache/net-libs/c-client-2007f-r6
index 9e0c6764669b..e8cac14c48d3 100644
--- a/metadata/md5-cache/net-libs/c-client-2007f-r6
+++ b/metadata/md5-cache/net-libs/c-client-2007f-r6
@@ -4,10 +4,10 @@ DESCRIPTION=UW IMAP c-client library
 EAPI=6
 HOMEPAGE=http://www.washington.edu/imap/
 IUSE=doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !net-mail/uw-imap kerberos? ( app-crypt/mit-krb5 )
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z chappa? ( mirror://gentoo/c-client-2007f-chappa-115-all.patch.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=c811e37b7e86f2f2b47423d0eb396812
+_md5_=84861f5922cb5e6d254b3e9c52e979c6
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.52 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.52
index 30ecb62eacd6..c0cdb5e358a5 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.52
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.52
@@ -4,9 +4,9 @@ DESCRIPTION=Small C library to run an HTTP server as part of another application
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
 IUSE=epoll messages ssl static-libs test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.52.tar.gz
-_md5_=553c0dfeecfe658e5e110742099409dd
+_md5_=76a589fa24494e726aee115e378a7276
diff --git a/metadata/md5-cache/net-libs/libssh-0.7.4 b/metadata/md5-cache/net-libs/libssh-0.7.4
index f624660193c8..ccc1e5a27f2b 100644
--- a/metadata/md5-cache/net-libs/libssh-0.7.4
+++ b/metadata/md5-cache/net-libs/libssh-0.7.4
@@ -4,10 +4,10 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=6
 HOMEPAGE=http://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test 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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/4
 SRC_URI=https://red.libssh.org/attachments/download/210/libssh-0.7.4.tar.xz -> libssh-0.7.4.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8d5ee4018844f45697f4066b9bbb999b
+_md5_=1cdfe330402ffe0759050baafe29585d
diff --git a/metadata/md5-cache/net-libs/libtirpc-1.0.1-r1 b/metadata/md5-cache/net-libs/libtirpc-1.0.1-r1
index dafba3986160..f6b907211fc0 100644
--- a/metadata/md5-cache/net-libs/libtirpc-1.0.1-r1
+++ b/metadata/md5-cache/net-libs/libtirpc-1.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Transport Independent RPC library (SunRPC replacement)
 EAPI=5
 HOMEPAGE=http://libtirpc.sourceforge.net/
 IUSE=ipv6 kerberos static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.0.1.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=218e6eb8fd2180ab8b6e258401b86d79
+_md5_=cfd0d9291c88d826dff7a47acfb3b7d9
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.0.20170509 b/metadata/md5-cache/net-libs/miniupnpc-2.0.20170509
index 0856bee5b608..dd4b02a554c5 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.0.20170509
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.0.20170509
@@ -4,9 +4,9 @@ DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=6
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~hppa ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0/16
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20170509.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=ae7bd4d946eca104abb702849ef879af
+_md5_=a4df9e018cf2252ae4e77aabf1449028
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.19.0 b/metadata/md5-cache/net-libs/nghttp2-1.19.0
index b3c6d2bcac94..1518c9dbb208 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.19.0
+++ b/metadata/md5-cache/net-libs/nghttp2-1.19.0
@@ -4,10 +4,10 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=6
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=cxx? ( dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[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(-)?] ) utils? ( >=dev-libs/libev-4.15[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-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7: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(-)?] )
 SLOT=0/1.14
 SRC_URI=https://github.com/tatsuhiro-t/nghttp2/releases/download/v1.19.0/nghttp2-1.19.0.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=49f009933a8349e42437521e42183139
+_md5_=6a62920c9ca75c2ebc0381a6f988b5c8
diff --git a/metadata/md5-cache/net-libs/opal-3.10.11-r1 b/metadata/md5-cache/net-libs/opal-3.10.11-r1
index 4724088eca20..d4159857b2f9 100644
--- a/metadata/md5-cache/net-libs/opal-3.10.11-r1
+++ b/metadata/md5-cache/net-libs/opal-3.10.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=C++ class library normalising numerous telephony protocols
 EAPI=6
 HOMEPAGE=http://www.opalvoip.org/
 IUSE=celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc ipv6 ivr java ldap libav lid +plugins sbc +sip +sipim +sound srtp ssl static-libs stats swig theora +video vpb vxml +wav x264 x264-static +xml elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MPL-1.0
 RDEPEND=>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[http,xml,vxml] ) java? ( >=virtual/jre-1.4:* ) plugins? ( media-sound/gsm celt? ( media-libs/celt:0 ) ffmpeg? ( libav? ( media-video/libav:0=[encode] ) !libav? ( media-video/ffmpeg:0=[encode] ) ) ilbc? ( dev-libs/ilbc-rfc3951 ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( virtual/ffmpeg media-libs/x264 ) ) srtp? ( net-libs/libsrtp:0= ) vxml? ( net-libs/ptlib[http,vxml] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 ) sip? ( sipim )
 SLOT=0
 SRC_URI=mirror://sourceforge/opalvoip/opal-3.10.11.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.10.11-htmldoc.tar.bz2 )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2ba6f46bfb33e450d8a2e05c66f6a2aa
+_md5_=332dd6b09478422545dbb4da1d7b2e05
diff --git a/metadata/md5-cache/net-libs/openslp-2.0.0-r1 b/metadata/md5-cache/net-libs/openslp-2.0.0-r1
deleted file mode 100644
index 7dfd177aaef0..000000000000
--- a/metadata/md5-cache/net-libs/openslp-2.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An open-source implementation of Service Location Protocol
-EAPI=5
-HOMEPAGE=http://www.openslp.org/
-IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/openslp/openslp-2.0.0.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=862e6294fca31f7c43f1322193d915e2
diff --git a/metadata/md5-cache/net-libs/openslp-2.0.0-r3 b/metadata/md5-cache/net-libs/openslp-2.0.0-r3
deleted file mode 100644
index 42731ee77fb3..000000000000
--- a/metadata/md5-cache/net-libs/openslp-2.0.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An open-source implementation of Service Location Protocol
-EAPI=6
-HOMEPAGE=http://www.openslp.org/
-IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/openslp/openslp-2.0.0.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=3a57f4cd1077456746fa60b0681d9da4
diff --git a/metadata/md5-cache/net-libs/openslp-2.0.0-r2 b/metadata/md5-cache/net-libs/openslp-2.0.0-r5
similarity index 96%
rename from metadata/md5-cache/net-libs/openslp-2.0.0-r2
rename to metadata/md5-cache/net-libs/openslp-2.0.0-r5
index 4d1b5cd1926f..7331d27d2afa 100644
--- a/metadata/md5-cache/net-libs/openslp-2.0.0-r2
+++ b/metadata/md5-cache/net-libs/openslp-2.0.0-r5
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openslp/openslp-2.0.0.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=acb145483d99f84ab13bb48ae4043ba0
+_md5_=3a9a0b8e958494a8a629ec1c6495b0c1
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.1.7 b/metadata/md5-cache/net-libs/socket_wrapper-1.1.7
index f7494a3e3cfb..7db4be72d784 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.1.7
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.1.7
@@ -4,9 +4,9 @@ DESCRIPTION=A library passing all socket communications through unix sockets
 EAPI=6
 HOMEPAGE=https://cwrap.org/socket_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.1.7.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=729384fff32377a24f64727f3ecee439
+_md5_=a13a1a1fee988ac7261560e14543e219
diff --git a/metadata/md5-cache/net-mail/courier-imap-4.17.3 b/metadata/md5-cache/net-mail/courier-imap-4.17.3
index b252291ffdb8..a80a06810839 100644
--- a/metadata/md5-cache/net-mail/courier-imap-4.17.3
+++ b/metadata/md5-cache/net-mail/courier-imap-4.17.3
@@ -4,11 +4,11 @@ DESCRIPTION=An IMAP daemon designed specifically for maildirs
 EAPI=6
 HOMEPAGE=http://www.courier-mta.org/
 IUSE=berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=net-libs/courier-authlib-0.61 >=net-libs/courier-unicode-1.3 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db:= ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd !net-mail/uw-imap
 REQUIRED_USE=|| ( berkdb gdbm )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-4.17.3.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=7af66bc8ea878f96246352633fb395c2
+_md5_=38c2fbc04776d5be57f5b97d617c6854
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p10-r1 b/metadata/md5-cache/net-misc/ntp-4.2.8_p10-r1
index ea232a78d26f..7e1cfb3ace6f 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p10-r1
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Network Time Protocol suite/programs
 EAPI=5
 HOMEPAGE=http://www.ntp.org/
 IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-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 ~m68k-mint
+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 ~m68k-mint
 LICENSE=HPND BSD ISC
 PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p10.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p10-manpages.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=7df2387335f141be55cf516fc34573b3
+_md5_=cd0fc1430a0bb60927dd8b65eb39f3eb
diff --git a/metadata/md5-cache/net-misc/openssh-7.5_p1-r1 b/metadata/md5-cache/net-misc/openssh-7.5_p1-r1
index b5bc19d15427..90b693938887 100644
--- a/metadata/md5-cache/net-misc/openssh-7.5_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-7.5_p1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=5
 HOMEPAGE=http://www.openssh.org/
 IUSE=abi_mips_n32 audit bindist debug +hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 GPL-2
 RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.5p1.tar.gz mirror://gentoo/openssh-7.4_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.5p1-hpnssh14v12.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.5p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-10.1/openssh-7.5p1+x509-10.1.diff.gz )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ed9cf202ede0bc47373f040db3bfcc10
+_md5_=62537935515af02902ba0460f588459a
diff --git a/metadata/md5-cache/net-misc/openssh-7.5_p1-r2 b/metadata/md5-cache/net-misc/openssh-7.5_p1-r2
new file mode 100644
index 000000000000..d09c9e02267d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-7.5_p1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare pretend test
+DEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=5
+HOMEPAGE=http://www.openssh.org/
+IUSE=abi_mips_n32 audit bindist debug +hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 GPL-2
+RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.5p1.tar.gz mirror://gentoo/openssh-7.4_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.5p1-hpnssh14v12.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.5p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-10.2/openssh-7.5p1+x509-10.2.diff.gz )
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=153beb117e3d7dc19c2eb314e68c000b
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.8.0 b/metadata/md5-cache/net-misc/tigervnc-1.8.0
index 698823b8eb44..9aa5341ce400 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.8.0
+++ b/metadata/md5-cache/net-misc/tigervnc-1.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Remote desktop viewer display system
 EAPI=6
 HOMEPAGE=http://www.tigervnc.org
 IUSE=+drm gnutls nls java +opengl pam server systemd +xorgmodule elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) xorgmodule? ( =x11-base/xorg-server-1.19* ) drm? ( x11-libs/libdrm ) ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.8.0.tar.gz -> tigervnc-1.8.0.tar.gz https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.19.1.tar.bz2 )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=aceaaa5c2f88049bcd7c1ff012253642
+_md5_=b6b6d6b2be952b5b59be4a354292665f
diff --git a/metadata/md5-cache/net-nds/rpcbind-0.2.4-r1 b/metadata/md5-cache/net-nds/rpcbind-0.2.4-r1
index 8488047b51e0..e2ed65705864 100644
--- a/metadata/md5-cache/net-nds/rpcbind-0.2.4-r1
+++ b/metadata/md5-cache/net-nds/rpcbind-0.2.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=portmap replacement which supports RPC over various protocols
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/rpcbind/
 IUSE=debug selinux systemd tcpd warmstarts
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=net-libs/libtirpc-1.0:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-rpcbind )
 SLOT=0
 SRC_URI=mirror://sourceforge/rpcbind/rpcbind-0.2.4.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=5f61fc473ec0f5529ffe5007de74bae6
+_md5_=19a2b823a1a95c1ef0573a90aef94ab1
diff --git a/metadata/md5-cache/net-print/cups-filters-1.13.5 b/metadata/md5-cache/net-print/cups-filters-1.13.5
index 77e9ba00e258..c7836f53a297 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.13.5
+++ b/metadata/md5-cache/net-print/cups-filters-1.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=Cups PDF filters
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format
 IUSE=dbus +foomatic jpeg ldap pdf perl png +postscript static-libs tiff zeroconf
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint
 LICENSE=MIT GPL-2
 RDEPEND=postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.13.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=ebaa183589944ec08b6e78b78e8e81aa
+_md5_=43b619ee72bcf8b6dc5cd89e141c4611
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20170331 b/metadata/md5-cache/net-print/foomatic-db-4.0.20170331
index 9ba4963d8317..83fffaaf0b63 100644
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20170331
+++ b/metadata/md5-cache/net-print/foomatic-db-4.0.20170331
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20170331.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1aadc46be0f2e266b219726e69c367b7
+_md5_=ac7fe46cd1f168482374787988ab9eb5
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
index 08b28e1b0ae6..b82d9c7246d1 100644
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
+++ b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
@@ -3,11 +3,11 @@ DEPEND=net-print/cups virtual/pkgconfig dev-lang/perl:=[-build(-)] >=app-portage
 DESCRIPTION=Generates ppds out of xml foomatic printer description files
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=net-print/foomatic-db
 RDEPEND=dev-libs/libxml2 || ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.12.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=38cb192be905f7a69a901ae4a1c9538d
+_md5_=0efde3a38c99df70b2aa7edea45fbf51
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
index e06892d3a8fb..c3a823c58f27 100644
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
+++ b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=linuxprinting.org PPD files for postscript printers
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20170331.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b447c4ab34e05684b6cdf29143ad7ea8
+_md5_=25acdd024f09f1355cba2dfc66f3e77f
diff --git a/metadata/md5-cache/net-proxy/privoxy-3.0.26 b/metadata/md5-cache/net-proxy/privoxy-3.0.26
index a6549ab65022..72cde6439b88 100644
--- a/metadata/md5-cache/net-proxy/privoxy-3.0.26
+++ b/metadata/md5-cache/net-proxy/privoxy-3.0.26
@@ -4,11 +4,11 @@ DESCRIPTION=A web proxy with advanced filtering capabilities for enhancing priva
 EAPI=6
 HOMEPAGE=http://www.privoxy.org https://sourceforge.net/projects/ijbswa/
 IUSE=+acl client-tags compression editor extended-host-patterns external-filters +fast-redirects +force graceful-termination ie-images +image-blocking ipv6 lfs png-images selinux +stats +threads toggle tools whitelists +zlib
-KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre zlib? ( sys-libs/zlib ) extended-host-patterns? ( dev-lang/perl ) selinux? ( sec-policy/selinux-privoxy ) tools? ( net-misc/curl dev-lang/perl )
 REQUIRED_USE=compression? ( zlib ) toggle? ( editor )
 SLOT=0
 SRC_URI=mirror://sourceforge/ijbswa/privoxy-3.0.26-stable-src.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=1265c536ac005e23eefeff7c90bcd842
+_md5_=24948607d062ffa555ebc441d6a1464a
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.2-r1 b/metadata/md5-cache/net-vpn/openvpn-2.4.2-r1
index 55dc3e4c7e06..7b0d76def94f 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.2-r1
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Robust and highly flexible tunneling application compatible with man
 EAPI=6
 HOMEPAGE=http://openvpn.net/
 IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl static systemd test userland_BSD
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.4.2.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.2/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8078b3b1056e740c8d38f4214c146fa6
+_md5_=4c57ba9591ae0cf45c8ac1c793737377
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.0.6 b/metadata/md5-cache/net-vpn/tor-0.2.9.11
similarity index 85%
rename from metadata/md5-cache/net-vpn/tor-0.3.0.6
rename to metadata/md5-cache/net-vpn/tor-0.2.9.11
index 16dab1151725..d8d5a067c5e2 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.0.6
+++ b/metadata/md5-cache/net-vpn/tor-0.2.9.11
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install setup
+DEFINED_PHASES=configure install prepare setup
 DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) virtual/pkgconfig
 DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.3.0.6.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.0.6.tar.gz
+SRC_URI=https://www.torproject.org/dist/tor-0.2.9.11.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.9.11.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=16c71fac405869cc9953e8bbc1f76a46
+_md5_=b2a2a852a8a773e750be783c555c56c8
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.0.7 b/metadata/md5-cache/net-vpn/tor-0.3.0.8
similarity index 84%
rename from metadata/md5-cache/net-vpn/tor-0.3.0.7
rename to metadata/md5-cache/net-vpn/tor-0.3.0.8
index 71d20e7a1491..11587a1c922b 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.0.7
+++ b/metadata/md5-cache/net-vpn/tor-0.3.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=6
 HOMEPAGE=http://www.torproject.org/
 IUSE=libressl scrypt seccomp selinux systemd tor-hardening test web
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.3.0.7.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.0.7.tar.gz
+SRC_URI=https://www.torproject.org/dist/tor-0.3.0.8.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.0.8.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=16c71fac405869cc9953e8bbc1f76a46
+_md5_=1028856cb573193b0f9b4290f0c9ae9d
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.1.2_alpha b/metadata/md5-cache/net-vpn/tor-0.3.1.3_alpha
similarity index 91%
rename from metadata/md5-cache/net-vpn/tor-0.3.1.2_alpha
rename to metadata/md5-cache/net-vpn/tor-0.3.1.3_alpha
index dac2ab25af7d..8945071151c6 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.1.2_alpha
+++ b/metadata/md5-cache/net-vpn/tor-0.3.1.3_alpha
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.3.1.2-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.1.2-alpha.tar.gz
+SRC_URI=https://www.torproject.org/dist/tor-0.3.1.3-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.1.3-alpha.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=59d84bc4feb9545b0ee4d3464f93a6d6
diff --git a/metadata/md5-cache/perl-core/File-Path-2.130.0 b/metadata/md5-cache/perl-core/File-Path-2.130.0
index d417f70213f2..76cbbf1e3861 100644
--- a/metadata/md5-cache/perl-core/File-Path-2.130.0
+++ b/metadata/md5-cache/perl-core/File-Path-2.130.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=File path and name utilities
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/File-Path/
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.13.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ba5c16379f402a2b82ecdbb2af38a38e
+_md5_=4e7c05b1020edcd03f5e7d9cd3666f3b
diff --git a/metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1 b/metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1
index ca6a69c37478..e760f511a6be 100644
--- a/metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1
+++ b/metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-libs/libxml2:2 media-gfx/exiv2 gtk? ( x11-libs/gtk+:2 ) app-text/docbook-xml-dtd:4.2 dev-libs/libxslt virtual/pkgconfig
+DEPEND=dev-libs/libxml2:2 media-gfx/exiv2:= gtk? ( x11-libs/gtk+:2 ) app-text/docbook-xml-dtd:4.2 dev-libs/libxslt virtual/pkgconfig
 DESCRIPTION=Tool for adjusting EXIF tags of your photos with a recorded GPS trace
 EAPI=6
 HOMEPAGE=https://github.com/freefoote/gpscorrelate
 IUSE=doc gtk
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:2 media-gfx/exiv2 gtk? ( x11-libs/gtk+:2 )
+RDEPEND=dev-libs/libxml2:2 media-gfx/exiv2:= gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://freefoote.dview.net/linux/gpscorrelate-1.6.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=d58f040b2d4e9580116546af2db3c902
+_md5_=e447740821658a71bf9de52b26881d6d
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.4.1 b/metadata/md5-cache/sys-apps/baselayout-2.4.1
new file mode 100644
index 000000000000..6a039d0d57ac
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/baselayout-2.4.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst prepare setup
+DESCRIPTION=Filesystem baselayout and init scripts
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+IUSE=build kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.4.1.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dea7185c871b91576aff598011c261bf
diff --git a/metadata/md5-cache/sys-apps/dbus-1.10.18 b/metadata/md5-cache/sys-apps/dbus-1.10.18
index 440b6c767247..ba56a70e6ccc 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.10.18
+++ b/metadata/md5-cache/sys-apps/dbus-1.10.18
@@ -4,7 +4,7 @@ DESCRIPTION=A message bus system, a simple way for applications to talk to each
 EAPI=6
 HOMEPAGE=https://dbus.freedesktop.org/
 IUSE=debug doc elogind selinux static-libs systemd test user-session X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-dbus )
 REQUIRED_USE=?? ( elogind systemd )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.10.18.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=dbeda65d22ab34b2a9ea346305cbc9e9
+_md5_=1a062e6ed6b8a432e4c4dbc553700f03
diff --git a/metadata/md5-cache/sys-apps/dmidecode-3.0 b/metadata/md5-cache/sys-apps/dmidecode-3.0
index 7bb339e67da4..5881ae0193c5 100644
--- a/metadata/md5-cache/sys-apps/dmidecode-3.0
+++ b/metadata/md5-cache/sys-apps/dmidecode-3.0
@@ -3,10 +3,10 @@ DESCRIPTION=DMI (Desktop Management Interface) table related utilities
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/dmidecode/
 IUSE=selinux
-KEYWORDS=-* amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris
+KEYWORDS=-* amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-dmidecode )
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/dmidecode/dmidecode-3.0.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=2a4417b97e1c3c3334989af4824f332d
+_md5_=10d9ac8c6183821640a3edd0e80ada54
diff --git a/metadata/md5-cache/sys-apps/ethtool-4.8 b/metadata/md5-cache/sys-apps/ethtool-4.8
index 2a0079e0b076..ab2351b87cdb 100644
--- a/metadata/md5-cache/sys-apps/ethtool-4.8
+++ b/metadata/md5-cache/sys-apps/ethtool-4.8
@@ -3,8 +3,8 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
 EAPI=5
 HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kernel/software/network/ethtool/ethtool-4.8.tar.xz
-_md5_=61f1f862615e252896de6d834c26c6d2
+_md5_=f5d8abe251491594d1bcc9753f73ffaf
diff --git a/metadata/md5-cache/sys-apps/file-5.30 b/metadata/md5-cache/sys-apps/file-5.30
index fb6eb86d67d2..6cffd865b158 100644
--- a/metadata/md5-cache/sys-apps/file-5.30
+++ b/metadata/md5-cache/sys-apps/file-5.30
@@ -4,11 +4,11 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=5
 HOMEPAGE=http://www.darwinsys.com/file/ http://mx.gw.com/pipermail/file/
 IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~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
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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=BSD-2
 RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.30.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.30.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=273a14a2417c7c0bd0f58ef9c878706f
+_md5_=39d7ff3733aeeef14485bdb4e1e21a3e
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.51 b/metadata/md5-cache/sys-apps/hdparm-9.51
index 007f99e40a1a..b9b2b87d675d 100644
--- a/metadata/md5-cache/sys-apps/hdparm-9.51
+++ b/metadata/md5-cache/sys-apps/hdparm-9.51
@@ -3,9 +3,9 @@ DESCRIPTION=Utility to change hard drive performance parameters
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/hdparm/
 IUSE=static
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hdparm/hdparm-9.51.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=e7c3cef07f67ace6b857f24652779b31
+_md5_=ad302da9b6d3482fe174213116a3c302
diff --git a/metadata/md5-cache/sys-apps/hwids-20170328 b/metadata/md5-cache/sys-apps/hwids-20170328
index 8dfa24b9a47a..a7c32473b462 100644
--- a/metadata/md5-cache/sys-apps/hwids-20170328
+++ b/metadata/md5-cache/sys-apps/hwids-20170328
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/hwids
 IUSE=+net +pci +udev +usb
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20170328.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=3565ef0bbb63e61e46bd96844ff0bdd7
+_md5_=5b29731742f8251240729947a5830979
diff --git a/metadata/md5-cache/sys-apps/noexec-1.1.0-r1 b/metadata/md5-cache/sys-apps/noexec-1.1.0-r1
index 4c39b308b97e..037f3ee01c8f 100644
--- a/metadata/md5-cache/sys-apps/noexec-1.1.0-r1
+++ b/metadata/md5-cache/sys-apps/noexec-1.1.0-r1
@@ -1,10 +1,10 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=-
 DEPEND=sys-libs/glibc
 DESCRIPTION=a package for preventing processes from using exec system calls
 EAPI=6
 HOMEPAGE=http://noexec.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/noexec/noexec-1.1.0.tar.gz
-_md5_=d5ea2b3bd27b5b8b14410ecca037ec01
+_md5_=6f2de5a9ef5be228c49677ff11e4279d
diff --git a/metadata/md5-cache/sys-apps/systemd-233-r1 b/metadata/md5-cache/sys-apps/systemd-233-r1
index d0f8f8d8ebbc..5be7c98eabfd 100644
--- a/metadata/md5-cache/sys-apps/systemd-233-r1
+++ b/metadata/md5-cache/sys-apps/systemd-233-r1
@@ -4,7 +4,7 @@ DESCRIPTION=System and service manager for Linux
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test vanilla xkb 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 ~ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.27.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) 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-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
@@ -12,4 +12,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v233.tar.gz -> systemd-233.tar.gz !doc? ( https://dev.gentoo.org/~floppym/dist/systemd-233-man.tar.gz )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fd36a718944e74aff242cde126947168
+_md5_=1fad18f637fd2d0e4543061d9e07c997
diff --git a/metadata/md5-cache/sys-apps/usbredir-0.7.1_p20170503 b/metadata/md5-cache/sys-apps/usbredir-0.7.1_p20170503
index 1bef2e5bb839..d92c0984814f 100644
--- a/metadata/md5-cache/sys-apps/usbredir-0.7.1_p20170503
+++ b/metadata/md5-cache/sys-apps/usbredir-0.7.1_p20170503
@@ -4,10 +4,10 @@ DESCRIPTION=TCP daemon and set of libraries for usbredir protocol (redirecting U
 EAPI=6
 HOMEPAGE=http://spice-space.org/page/UsbRedir
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=http://spice-space.org/download/usbredir/usbredir-0.7.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/usbredir-0.7.1_p20170503-patches.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=22d35f1845f38446710a52b228932987
+_md5_=0b2edf99ac41e0f941e30f2c3a43b96d
diff --git a/metadata/md5-cache/sys-auth/keystone-11.0.0-r1 b/metadata/md5-cache/sys-auth/keystone-11.0.0-r1
deleted file mode 100644
index 9ed18832da4e..000000000000
--- a/metadata/md5-cache/sys-auth/keystone-11.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=The Openstack authentication, authorization, and service catalog
-EAPI=6
-HOMEPAGE=https://launchpad.net/keystone
-IUSE=+sqlite ldap memcached mongo mysql postgres test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauthlib-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysaml2-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pysaml2-4.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ldap? ( >=dev-python/pyldap-2.4.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ldappool-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/keystone/keystone-11.0.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a4ad570c32d308fb41e907df0e30e991
diff --git a/metadata/md5-cache/sys-auth/keystone-11.0.1 b/metadata/md5-cache/sys-auth/keystone-11.0.1
deleted file mode 100644
index c72955cd3e76..000000000000
--- a/metadata/md5-cache/sys-auth/keystone-11.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=The Openstack authentication, authorization, and service catalog
-EAPI=6
-HOMEPAGE=https://launchpad.net/keystone
-IUSE=+sqlite ldap memcached mongo mysql postgres test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauthlib-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysaml2-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pysaml2-4.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ldap? ( >=dev-python/pyldap-2.4.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ldappool-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/keystone/keystone-11.0.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9826ce9bc18c396a814bd4fa5c8857a6
diff --git a/metadata/md5-cache/sys-auth/keystone-11.0.2 b/metadata/md5-cache/sys-auth/keystone-11.0.2
index 7ae9516ce526..e9c5d17277f8 100644
--- a/metadata/md5-cache/sys-auth/keystone-11.0.2
+++ b/metadata/md5-cache/sys-auth/keystone-11.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=The Openstack authentication, authorization, and service catalog
 EAPI=6
 HOMEPAGE=https://launchpad.net/keystone
 IUSE=+sqlite ldap memcached mongo mysql postgres test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauthlib-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysaml2-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pysaml2-4.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ldap? ( >=dev-python/pyldap-2.4.20[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ldappool-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/keystone/keystone-11.0.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=177e52e6e62756665516e0fcda20dee0
+_md5_=3ef1ae74ce132182a60c7a81d24febed
diff --git a/metadata/md5-cache/sys-auth/pam_p11-0.1.6 b/metadata/md5-cache/sys-auth/pam_p11-0.1.6
index 4e610032b3ab..771ee6461162 100644
--- a/metadata/md5-cache/sys-auth/pam_p11-0.1.6
+++ b/metadata/md5-cache/sys-auth/pam_p11-0.1.6
@@ -3,10 +3,10 @@ DEPEND=virtual/pam dev-libs/libp11 dev-libs/openssl:0= virtual/pkgconfig
 DESCRIPTION=PAM module for authenticating against PKCS#11 tokens
 EAPI=6
 HOMEPAGE=https://github.com/opensc/pam_p11/wiki
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/pam dev-libs/libp11 dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/OpenSC/pam_p11/releases/download/pam_p11-0.1.6/pam_p11-0.1.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=aff564dcc4073d7b8ac66f31763b6dda
+_md5_=656bde778e7f5d4d2944631062f33080
diff --git a/metadata/md5-cache/sys-cluster/nova-14.0.5 b/metadata/md5-cache/sys-cluster/nova-14.0.5
deleted file mode 100644
index b5dbe632973a..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-14.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
-EAPI=6
-HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rfc3986-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-vif-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/wsgiintercept-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/newton/nova.conf.sample -> newton-nova.conf.sample https://tarballs.openstack.org/nova/nova-14.0.5.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9517199b288b839378c1b5e314f1afaf
diff --git a/metadata/md5-cache/sys-cluster/nova-14.0.6 b/metadata/md5-cache/sys-cluster/nova-14.0.6
deleted file mode 100644
index b6dd93d744dc..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-14.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
-EAPI=6
-HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rfc3986-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-vif-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/newton/nova.conf.sample -> newton-nova.conf.sample https://tarballs.openstack.org/nova/nova-14.0.6.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=c5f69b7f767335beacaae28589a0a8eb
diff --git a/metadata/md5-cache/sys-cluster/nova-14.0.7 b/metadata/md5-cache/sys-cluster/nova-14.0.7
index 4865b1dca683..df0290f77619 100644
--- a/metadata/md5-cache/sys-cluster/nova-14.0.7
+++ b/metadata/md5-cache/sys-cluster/nova-14.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in P
 EAPI=6
 HOMEPAGE=https://launchpad.net/nova
 IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rfc3986-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-vif-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/newton/nova.conf.sample -> newton-nova.conf.sample https://tarballs.openstack.org/nova/nova-14.0.7.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=033d3ff87b355608f63f27e8876603b0
+_md5_=6d17511f81bf23931d4d5a890774760b
diff --git a/metadata/md5-cache/sys-cluster/nova-15.0.3 b/metadata/md5-cache/sys-cluster/nova-15.0.3
deleted file mode 100644
index f0982c13cb15..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-15.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
-EAPI=6
-HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-vif-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-xenapi-0.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-15.0.3 https://tarballs.openstack.org/nova/nova-15.0.3.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8520ebe4664300fc66cf260c96969008
diff --git a/metadata/md5-cache/sys-cluster/nova-15.0.4 b/metadata/md5-cache/sys-cluster/nova-15.0.4
deleted file mode 100644
index 326706617573..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-15.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
-EAPI=6
-HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-vif-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-xenapi-0.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-15.0.4 https://tarballs.openstack.org/nova/nova-15.0.4.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=1a3dfea4374dabe50631d291c9ea9bd4
diff --git a/metadata/md5-cache/sys-cluster/nova-15.0.5 b/metadata/md5-cache/sys-cluster/nova-15.0.5
index 2414d5f3016e..38a73fe18a4d 100644
--- a/metadata/md5-cache/sys-cluster/nova-15.0.5
+++ b/metadata/md5-cache/sys-cluster/nova-15.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in P
 EAPI=6
 HOMEPAGE=https://launchpad.net/nova
 IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-vif-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-xenapi-0.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-15.0.5 https://tarballs.openstack.org/nova/nova-15.0.5.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=a2a2a0eb6cf4dcc8109ad26031de1a1a
+_md5_=83519533cf9bb05c16cb28a3e4f66385
diff --git a/metadata/md5-cache/sys-devel/gdb-7.12.1 b/metadata/md5-cache/sys-devel/gdb-7.12.1
index 6dc0f9098d84..dec7c73091bf 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.12.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU debugger
 EAPI=5
 HOMEPAGE=https://sourceware.org/gdb/
 IUSE=+client lzma multitarget nls +python +server test vanilla xml 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
-KEYWORDS=-alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=-alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=server? ( !dev-util/gdbserver ) client? ( >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) xml? ( dev-libs/expat ) sys-libs/zlib )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) ) || ( client server )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-7.12.1.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=c36dccc521e4a9e889e9f0d8499f7701
+_md5_=5052a24c7aac1d5d09fbee88a182eaf6
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.8.1 b/metadata/md5-cache/sys-devel/gettext-0.19.8.1
index 966fdbc999f4..18e3a3ee52cf 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.8.1
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU locale utilities
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gettext/
 IUSE=acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_FreeBSD java 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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
 PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4:= ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.8.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2de7a034bea605ab72391c5721cef61f
+_md5_=2a9bfb75da5601eb16df996fee5ac242
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-1.7.4 b/metadata/md5-cache/sys-fs/cryptsetup-1.7.4
index fa0f06081159..cd09c7263d7b 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-1.7.4
+++ b/metadata/md5-cache/sys-fs/cryptsetup-1.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=5
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=+gcrypt kernel nettle openssl libressl nls pwquality python reencrypt static static-libs udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/libgpg-error dev-libs/popt sys-apps/util-linux gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) 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(-)] )
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) static? ( !gcrypt )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.4.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e9289c5345ecdac81ee19be34e9e7b6a
+_md5_=56d0dbbfdd25ce38ab6d36435fdc23ff
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
index 331be3f4eb35..fb2fa872c7c0 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
@@ -4,11 +4,11 @@ DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=6
 HOMEPAGE=https://sourceware.org/lvm2/
 IUSE=readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync ) openais? ( sys-cluster/openais ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.145.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.145.tgz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=90ad6b2fbe8c9fb523285ca77a1d4e0a
+_md5_=d6aed377a136f55abdf4800c8bda57d8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.16
index c5226277f47f..3ec55ac9a916 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.16
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.16
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
 EAPI=5
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=4.9.16
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-18.base.tar.xz mirror://gentoo/genpatches-4.9-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-18.experimental.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	kernel-2	1241c87493492a950598df999f91e603	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c48effc2f162aee9b1d97e1454a79952
+_md5_=87915d8fd2c0047a1fe0784d2f50f1cd
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20170314 b/metadata/md5-cache/sys-kernel/linux-firmware-20170314
index 96cf335f83da..d148eda44b2c 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20170314
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20170314
@@ -3,10 +3,10 @@ DESCRIPTION=Linux firmware files
 EAPI=6
 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 IUSE=savedconfig savedconfig
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist
 RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
 SLOT=0
 SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-e39f0e3e6897ad865b3704f61218ae83f98a85da.tar.xz -> linux-firmware-20170314.tar.xz
 _eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=544482e594ceecd89b6f8d6cec1d0334
+_md5_=3ace06370f56777d9f5ac6710aafb868
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.29-r1 b/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
index b33bbe7c915f..3931e4c7fc54 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
+++ b/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=http://ldb.samba.org
 IUSE=doc +ldap +python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.8[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.12[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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(+)] ) ldap? ( net-nds/openldap )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/1.1.29
 SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.1.29.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=19689c133362805de8eba144e731512d
+_md5_=58d89a504bd10db5c6caea6cf25b667c
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.3.2 b/metadata/md5-cache/sys-libs/libsmbios-2.3.2
index d0428cc5c933..ebc6aba66236 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.3.2
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Provide access to (SM)BIOS information
 EAPI=6
 HOMEPAGE=http://linux.dell.com/files/libsmbios/
 IUSE=doc graphviz nls python static-libs test python_targets_python2_7
-KEYWORDS=amd64 ~ia64 x86
+KEYWORDS=amd64 ia64 x86
 LICENSE=GPL-2 OSL-2.0
 RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/dell/libsmbios/archive/v2.3.2.tar.gz -> libsmbios-2.3.2.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9a3ca6aacadc730682853944dad4d5f5
+_md5_=45ab084695142dee0331fe418c48321d
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.9 b/metadata/md5-cache/sys-libs/talloc-2.1.9
index 39342460bb57..6eadd5f86fc3 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.9
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.9
@@ -4,7 +4,7 @@ DESCRIPTION=Samba talloc library
 EAPI=6
 HOMEPAGE=http://talloc.samba.org/
 IUSE=compat +python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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(+)] ) !!<sys-libs/talloc-2.0.5
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.1.9.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=d1b38a714f6af67f7d5b77403ef9f9e7
+_md5_=c560e51f5c7479363f5e9959c1b87c9d
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.13 b/metadata/md5-cache/sys-libs/tdb-1.3.13
index ccd295927cff..f6a62d6e01f7 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.13
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.13
@@ -4,11 +4,11 @@ DESCRIPTION=A simple database API
 EAPI=6
 HOMEPAGE=http://tdb.samba.org/
 IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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(+)] )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.13.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=817658635e2385cc3fb533a12dc777bb
+_md5_=6306758a4688d27c3f5c36e6ea5a500a
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.31-r1 b/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
index 7b6759d7356a..97a19f28dcf8 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Samba tevent library
 EAPI=6
 HOMEPAGE=http://tevent.samba.org/
 IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/talloc-2.1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=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(+)] )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tevent/tevent-0.9.31.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=f139794bdaf648734447bfaf46c34a49
+_md5_=d0d3ab84d6c25f6fb781e07f90d06011
diff --git a/metadata/md5-cache/virtual/emacs-25 b/metadata/md5-cache/virtual/emacs-25
index 239c80e54635..64d97dbddc85 100644
--- a/metadata/md5-cache/virtual/emacs-25
+++ b/metadata/md5-cache/virtual/emacs-25
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for GNU Emacs
 EAPI=6
-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
+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
 RDEPEND=|| ( app-editors/emacs:25 >=app-editors/emacs-vcs-25.1 )
 SLOT=0
-_md5_=ce3a986bac0eb97f6f32d8e4e64d6d07
+_md5_=d94fffc4d98c81c431ec2b3de343afb9
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.130.0 b/metadata/md5-cache/virtual/perl-File-Path-2.130.0
index a9b26d586bba..c7afb2df8175 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.130.0
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.130.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Path
 EAPI=6
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/File-Path-2.130.0 dev-lang/perl:= !<perl-core/File-Path-2.130.0 !>perl-core/File-Path-2.130.0-r999
 SLOT=0
-_md5_=090e3a7a3943697081994ced50788b9e
+_md5_=789338368cf8995bf1aa2437f56876ff
diff --git a/metadata/md5-cache/virtual/pypy-5.8.0 b/metadata/md5-cache/virtual/pypy-5.8.0
new file mode 100644
index 000000000000..1292eff590cc
--- /dev/null
+++ b/metadata/md5-cache/virtual/pypy-5.8.0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for PyPy Python implementation
+EAPI=6
+IUSE=bzip2 gdbm ncurses sqlite tk
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+RDEPEND=|| ( >=dev-python/pypy-5.8.0:0/41[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy-bin-5.8.0:0/41[gdbm(-)?,sqlite?,tk?] )
+SLOT=0/41
+_md5_=93e86a21f7871d0e943cb86a8aa8f082
diff --git a/metadata/md5-cache/virtual/pypy3-5.7.1 b/metadata/md5-cache/virtual/pypy3-5.7.1
index 2506f3b91915..1d5df91ce63c 100644
--- a/metadata/md5-cache/virtual/pypy3-5.7.1
+++ b/metadata/md5-cache/virtual/pypy3-5.7.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for PyPy3 Python implementation
 EAPI=6
 IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~amd64-linux
 RDEPEND=|| ( >=dev-python/pypy3-5.7.1:0/57[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy3-bin-5.7.1:0/57[gdbm(-)?,sqlite?,tk?] )
 SLOT=0/57
-_md5_=526230654765921e0a459579606b011a
+_md5_=29ba141f3d6f9512975c40551153195c
diff --git a/metadata/md5-cache/virtual/pypy3-5.8.0-r1 b/metadata/md5-cache/virtual/pypy3-5.8.0-r1
new file mode 100644
index 000000000000..db6f3db01f30
--- /dev/null
+++ b/metadata/md5-cache/virtual/pypy3-5.8.0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for PyPy3 Python implementation
+EAPI=6
+IUSE=bzip2 gdbm ncurses sqlite tk
+KEYWORDS=~amd64 ~amd64-linux
+RDEPEND=|| ( >=dev-python/pypy3-5.8.0:0/58[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy3-bin-5.8.0:0/58[gdbm(-)?,sqlite?,tk?] )
+SLOT=0/58
+_md5_=8099d41a61811a7a93a4ccfb58c3f940
diff --git a/metadata/md5-cache/virtual/python-dnspython-2 b/metadata/md5-cache/virtual/python-dnspython-2
index c8f6bcf7d3d8..bab4f2da3ab2 100644
--- a/metadata/md5-cache/virtual/python-dnspython-2
+++ b/metadata/md5-cache/virtual/python-dnspython-2
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for dnspython, for Python 2 & 3
 EAPI=6
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dnspython-1.15.0:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=ea00a7a97a2deaf037a79c4f863f8d2f
+_md5_=644dbad48139d65f4178392acb7f6d75
diff --git a/metadata/md5-cache/www-apps/wordpress-4.8 b/metadata/md5-cache/www-apps/wordpress-4.8
new file mode 100644
index 000000000000..56ef332f5908
--- /dev/null
+++ b/metadata/md5-cache/www-apps/wordpress-4.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Wordpress PHP and MySQL based content management system (CMS)
+EAPI=6
+HOMEPAGE=https://wordpress.org/
+IUSE=+akismet examples +themes vhosts vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) >=app-admin/webapp-config-1.50.15
+SLOT=4.8
+SRC_URI=https://wordpress.org/wordpress-4.8.tar.gz
+_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=2d8c70d9a087c86df718322d0f139919
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.45 b/metadata/md5-cache/www-servers/lighttpd-1.4.45
index b013ae73845b..585ed402ce6c 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.45
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.45
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight high-performance web server
 EAPI=6
 HOMEPAGE=http://www.lighttpd.net/
 IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.45.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=d729e6230aae316aaf198555494f811c
+_md5_=aac4364566b088635bb3ef667612efe5
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.4.0 b/metadata/md5-cache/x11-apps/xkbcomp-1.4.0
index 56ac5cba9156..94ce1378e4e0 100644
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.4.0
+++ b/metadata/md5-cache/x11-apps/xkbcomp-1.4.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison >=app-portage/elt-pat
 DESCRIPTION=compile XKB keyboard description
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xkbcomp-1.4.0.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xorg-2	85b1e64779a3286b1224aef7dcfbca28
-_md5_=fd747034851ba7747da87beded753e9d
+_md5_=f2a6aff4913a1114672d69a2894078ba
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.19.3 b/metadata/md5-cache/x11-base/xorg-server-1.19.3
index e9c6a8f7e377..38b3c34a94f1 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.19.3
+++ b/metadata/md5-cache/x11-base/xorg-server-1.19.3
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind static-libs doc
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.19 )
 RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.46 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xeph
 SLOT=0/1.19.3
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.19.3.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	85b1e64779a3286b1224aef7dcfbca28
-_md5_=aec8ad82b724bf1e5fcf23a7bc4526cb
+_md5_=2b80dde66f2a0e1db14b83ca68c294eb
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.25.1 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.25.1
index f5735b357a7e..0cbce7ffc6fa 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.25.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.25.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libinput-1.5.0:0= >=app-portage/elt-patches-20170317 !<sys-dev
 DESCRIPTION=X.org input driver based on libinput
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.5.0:0= x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.25.1.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	85b1e64779a3286b1224aef7dcfbca28
-_md5_=3ebb3bb75a5fd9aa1da23b077fcd29d4
+_md5_=12783c279b7a76b390ee8c0c4635be34
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.9.0 b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.9.0
index da0ae657b61b..0f99561c2e30 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.9.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=ATI video driver
 EAPI=5
 HOMEPAGE=http://www.x.org/wiki/ati/
 IUSE=+glamor udev
-KEYWORDS=alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.58[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/udev ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-ati-7.9.0.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	85b1e64779a3286b1224aef7dcfbca28
-_md5_=e88e1da55e0f1a7bf31055fd3bf6cd55
+_md5_=5c45a056994775863fe31a0e2dd6133d
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.80 b/metadata/md5-cache/x11-libs/libdrm-2.4.80
index 54ad28416ec9..41581a820441 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.80
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.80
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=https://dri.freedesktop.org/
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind 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 static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.80.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xorg-2	85b1e64779a3286b1224aef7dcfbca28
-_md5_=3ed5161811f48f09bcc53dffaf3461be
+_md5_=87dd21ae8bfee39befb6692995816a44
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-0.7.1 b/metadata/md5-cache/x11-libs/libxkbcommon-0.7.1
index 71c1a718d5c6..e26f5f36acce 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-0.7.1
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-0.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org xkbcommon library
 EAPI=5
 HOMEPAGE=https://xkbcommon.org/
 IUSE=X doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/libxcb-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xkbcommon.org/download/libxkbcommon-0.7.1.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xorg-2	85b1e64779a3286b1224aef7dcfbca28
-_md5_=3d239c8bd4cfb99d5937f816c7cb37da
+_md5_=a643d2c1302bf0e0161346d0f6e971ea
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.6 b/metadata/md5-cache/x11-libs/motif-2.3.6
deleted file mode 100644
index 733a15b75079..000000000000
--- a/metadata/md5-cache/x11-libs/motif-2.3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex || ( dev-util/byacc sys-freebsd/freebsd-ubin ) x11-misc/xbitmaps >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The Motif user interface component toolkit
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/motif/ http://motif.ics.com/
-IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+ MIT
-RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.6%20Source%20Code/motif-2.3.6.tar.gz http://dev.gentoo.org/~ulm/distfiles/motif-2.3.5-patches-1.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=821169dfe45ed7425f610b6ce1537060
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.6-r1 b/metadata/md5-cache/x11-libs/motif-2.3.6-r1
index b29d2d3f3c53..a6b63d8c9fe1 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.6-r1
+++ b/metadata/md5-cache/x11-libs/motif-2.3.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The Motif user interface component toolkit
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/motif/ http://motif.ics.com/
 IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.6%20Source%20Code/motif-2.3.6.tar.gz http://dev.gentoo.org/~ulm/distfiles/motif-2.3.6-patches-2.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=25d498b138802297bb0847dfae982916
+_md5_=e771e8e6d9e5b88e7f84ef543f66e403
diff --git a/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1 b/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1
index e90e727f8680..1894d8a74ac8 100644
--- a/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1
+++ b/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1
@@ -3,9 +3,9 @@ DEPEND=>=dev-perl/XML-Simple-2 >=dev-lang/perl-5
 DESCRIPTION=Utils to help with the transition to the new freedesktop.org naming scheme
 EAPI=6
 HOMEPAGE=http://tango.freedesktop.org
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-perl/XML-Simple-2 >=dev-lang/perl-5
 SLOT=0
 SRC_URI=http://tango.freedesktop.org/releases/icon-naming-utils-0.8.90.tar.gz
-_md5_=45ff012a6e588f24e26ce56dcf1d5a7b
+_md5_=1cebcfb189f42a9294ce9e7742eecb7e
diff --git a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r1 b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r1
index a2a7f446b8f7..8e0b41781d3b 100644
--- a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r1
+++ b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXtst x11-proto/inputproto x11-proto/xextproto
 DESCRIPTION=small tool to report and change the keyboard LED states of an X display
 EAPI=5
 HOMEPAGE=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/
-KEYWORDS=alpha amd64 hppa ~ia64 ~mips ppc sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 SRC_URI=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/xsetleds-0.1.3.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=567d23afb22bcb91a4f120c250b3b878
+_md5_=16b243ce6a4b414088e985bb54fa0349
diff --git a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4 b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
index 69b7b9174ec2..3a975318710a 100644
--- a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
+++ b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A GKrellM plugin that shows sunrise and sunset times
 EAPI=6
 HOMEPAGE=http://gkrellsun.sourceforge.net/
 IUSE=nls
-KEYWORDS=alpha amd64 hppa ~ia64 ppc sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm[X] nls? ( sys-devel/gettext ) =app-admin/gkrellm-2*
 SLOT=1
 SRC_URI=mirror://sourceforge/gkrellsun/gkrellsun-1.0.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=bb03dd8f1bfdc83cf01e71b0259a2b80
+_md5_=7f401c66a6e681b06999c79871c9020e
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.8.18_p20170601 b/metadata/md5-cache/x11-themes/qtcurve-1.8.18_p20170601
new file mode 100644
index 000000000000..8420d242dfc0
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.8.18_p20170601
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=X? ( x11-libs/libxcb x11-libs/libX11 ) gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtdbus:5 dev-qt/qtx11extras:5 ) ) !x11-themes/gtk-engines-qtcurve virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A set of widget styles for Qt and GTK2
+EAPI=6
+HOMEPAGE=https://github.com/QtCurve/qtcurve
+IUSE=+X gtk nls +qt4 qt5
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=X? ( x11-libs/libxcb x11-libs/libX11 ) gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtdbus:5 dev-qt/qtx11extras:5 ) ) !x11-themes/gtk-engines-qtcurve
+REQUIRED_USE=gtk? ( X ) || ( gtk qt4 qt5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~kensington/distfiles/qtcurve-1.8.18_p20170601.tar.xz
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4c26ec735d232d2583c962690ef1cbd4
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8391debfabdb..a0e2b8bb6dc9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Jun 2017 17:39:32 +0000
+Sat, 10 Jun 2017 17:39:41 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ab91163a3ed5..a5744345b2de 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jun  9 17:39:32 UTC 2017
+Sat Jun 10 17:39:41 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6ee157aaceea..8cf5095811bd 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Jun 2017 18:00:01 +0000
+Sat, 10 Jun 2017 18:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 4504355e67db..fbe207481eaf 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-7e2583438cc93d2d47d95a427733f57bcf4c4624 1497026817 2017-06-09T16:46:57+00:00
+d539525863023e0fe442356701cc68b006cd0451 1497115407 2017-06-10T17:23:27+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f8d940939646..30ed81549ea7 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1497029701 Fri 09 Jun 2017 05:35:01 PM UTC
+1497116101 Sat 10 Jun 2017 05:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8391debfabdb..a0e2b8bb6dc9 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Jun 2017 17:39:32 +0000
+Sat, 10 Jun 2017 17:39:41 +0000
diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest
index d189e521b15f..88b43638bfd8 100644
--- a/net-analyzer/masscan/Manifest
+++ b/net-analyzer/masscan/Manifest
@@ -1 +1,2 @@
 DIST masscan-1.0.3.tar.gz 333393 SHA256 331edd529df1904bcbcfb43029ced7e2dafe1744841e74cd9fc9f440b8301085 SHA512 e64b11deaaaa71d5be95e8f2b1fdfa679f5c8e8074c97f9d60d57659f33aec0699673c5aab72824f62d1a8b0e8c9188dcf296dd078bc6c2dbdad95c35c3a5f40 WHIRLPOOL fa1c4e931ef0d6ca534b0ccff790e86eef3a058f46b39fff0c94326fa41ddee9007030240a83171171ef10ead862721844330599ff271bbc08ca9f168ff6a3d0
+DIST masscan-1.0.4.tar.gz 343513 SHA256 51de345f677f46595fc3bd747bfb61bc9ff130adcbec48f3401f8057c8702af9 SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b WHIRLPOOL e90bfe019e1c047b3f3c8e8c7e51ac2998c8b4eed817c9757dcf1d1fdffa9f1f298d4944e6cad67346159c8ba1ad886895f2b74184a8aa7818881e4a15c28a72
diff --git a/net-analyzer/masscan/masscan-1.0.3-r1.ebuild b/net-analyzer/masscan/masscan-1.0.4.ebuild
similarity index 73%
rename from net-analyzer/masscan/masscan-1.0.3-r1.ebuild
rename to net-analyzer/masscan/masscan-1.0.4.ebuild
index 96e9e63bb4b8..66006b6476c1 100644
--- a/net-analyzer/masscan/masscan-1.0.3-r1.ebuild
+++ b/net-analyzer/masscan/masscan-1.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Mass IP port scanner"
@@ -13,31 +13,29 @@ LICENSE="AGPL-3"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
 
 src_prepare(){
+	default
+
 	sed -i \
 		-e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
 		-e '/^GITVER :=/s!= .(.*!=!g' \
 		-e '/^SYS/s|gcc|$(CC)|g' \
-		-e '/$(CC)/s!-DGIT=\"$(GITVER)\"!!g' \
 		-e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
 		Makefile || die
-}
 
-src_compile() {
-	emake CC="$(tc-getCC)"
+	tc-export CC
 }
 
 src_install() {
-	emake CC="$(tc-getCC)" DESTDIR="${D}" PREFIX=/usr install
+	dobin bin/masscan
 
 	insinto /etc/masscan
 	doins data/exclude.conf
 	doins "${FILESDIR}"/masscan.conf
 
 	mv doc/bot.{hml,html} || die
-	dohtml doc/bot.html
+	dodoc doc/bot.html *.md
+
 	doman doc/masscan.8
-	dodoc *.md
 }
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index ecac5649c218..e61c79cd6d27 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -1 +1,3 @@
 DIST netselect-0.3.tar.gz 22047 SHA256 fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978 SHA512 04a4b79c357a0110dcf377ad04ac729ed7854bec4b064ad16da632367ce1870379546fffc8396ea770bfa580618d7c0495c16b0ba30f736419511b890ce5dca5 WHIRLPOOL 2e49cb22b12c88a1d9f42da19b42284ae98d391739bf7bd1e134661b8780ef733b26f5f4be4ed61dce3a4a9922a6a10d9040698fa3f4910ceacc54df4a42afcc
+DIST netselect-0.4-ipv6.patch.xz 18272 SHA256 be68354508c6b17927ffe01db2ed2f8e5f259a869d6f209ba8d2e648de01e143 SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea WHIRLPOOL c51648b80c5e21388077d76ff793eda78f7986c395965df4c29179280469485bca4c7d1785036a67b2946c2772e26fefc9ee37511c24966739bb1debfc1021d6
+DIST netselect-0.4.tar.gz 22095 SHA256 ae343991c94b1fdeb5e7896bb11d357c1dd9297f5d842c507953f57935e15e19 SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa WHIRLPOOL 26560ff81683c48ad7c94e827029b4b0a127c29b94fe47fe2b95f3736eafeeeaa2c9b1e9f6feff7971a37cd15fdb51814acd195ebafd6e89face3d514eb872c3
diff --git a/net-analyzer/netselect/files/netselect-0.4-bsd.patch b/net-analyzer/netselect/files/netselect-0.4-bsd.patch
new file mode 100644
index 000000000000..fd49a17682db
--- /dev/null
+++ b/net-analyzer/netselect/files/netselect-0.4-bsd.patch
@@ -0,0 +1,56 @@
+--- a/netselect.c
++++ b/netselect.c
+@@ -39,14 +39,14 @@
+  * hey, great!  Let me know. -- apenwarr
+  */
+ 
+-#ifdef __EMX__
+-# include <io.h>
+-# include <fcntl.h>
+-# include <sys/types.h>
+-# include <sys/select.h>
+-# include <machine/endian.h>
+-#else
+-# include <endian.h>
++#ifdef __linux__
++#include <endian.h>
++#include <sys/types.h>
++#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
++#if defined(__OpenBSD__)
++#include <machine/types.h>
++#endif
++#include <machine/endian.h>
+ #endif
+ 
+ #include <sys/param.h>
+@@ -167,6 +167,7 @@
+     extern int optind;
+     int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100;
+     int ch, seq, ttl, max_ttl = 30, num_score = 1;
++    int on = 1;
+     int use_icmp = 0;
+     unsigned int min_tries = 10;
+     struct timeval now;
+@@ -234,7 +235,12 @@
+     if (verbose >= 1)
+ 	fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n",
+ 		num_score, numhosts, numhosts==1 ? "" : "es");
+-    
++   
++   if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)) < 0) {
++        perror("IP_HDRINCL");
++	_exit(EXIT_FAILURE);
++   }
++
+     /* keep going until most of the hosts have been finished */
+     must_continue = numhosts;
+     while (must_continue && must_continue >= numhosts/2)
+@@ -712,7 +718,7 @@
+     ip->ip_off = 0;
+     ip->ip_hl = sizeof(*ip) >> 2;
+     ip->ip_p = IPPROTO_UDP;
+-    ip->ip_len = 0; /* kernel fills this in */
++    ip->ip_len = sizeof(OPacket);
+     ip->ip_ttl = ttl;
+     ip->ip_v = IPVERSION;
+     ip->ip_id = htons(ident + seq);
diff --git a/net-analyzer/netselect/files/netselect-0.4-flags.patch b/net-analyzer/netselect/files/netselect-0.4-flags.patch
new file mode 100644
index 000000000000..ffcfead8eb3a
--- /dev/null
+++ b/net-analyzer/netselect/files/netselect-0.4-flags.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,8 +3,7 @@
+ MANDEST = ${PREFIX}/man/man1
+ 
+ CC = gcc
+-CFLAGS = -O2 -Wall -I. -g
+-LDFLAGS = -g
++CFLAGS += -Wall -I.
+ LIBS = 
+ 
+ ifdef OS2
diff --git a/net-analyzer/netselect/netselect-0.4.ebuild b/net-analyzer/netselect/netselect-0.4.ebuild
new file mode 100644
index 000000000000..a6d716516f07
--- /dev/null
+++ b/net-analyzer/netselect/netselect-0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Ultrafast implementation of ping"
+HOMEPAGE="http://apenwarr.ca/netselect/"
+SRC_URI="
+	https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
+	ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz )
+"
+
+LICENSE="BSD"
+SLOT="0"
+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 ~x86-macos"
+IUSE="ipv6"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-bsd.patch
+	"${FILESDIR}"/${PN}-0.4-flags.patch
+)
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
+
+	default
+
+	tc-export CC
+}
+
+src_install () {
+	dobin netselect
+
+	if ! use prefix ; then
+		fowners root:wheel /usr/bin/netselect
+		fperms 4711 /usr/bin/netselect
+	fi
+
+	dodoc HISTORY README
+
+	doman netselect.1
+}
diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 0a10167a4003..1582792f3e64 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
diff --git a/net-dns/bind-tools/bind-tools-9.10.5.ebuild b/net-dns/bind-tools/bind-tools-9.10.5.ebuild
index 7c79e6062d3d..bb0e0063ee52 100644
--- a/net-dns/bind-tools/bind-tools-9.10.5.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.10.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind-tools/bind-tools-9.11.0_p5.ebuild b/net-dns/bind-tools/bind-tools-9.11.0_p5.ebuild
index f1ed0754dd99..fcf26a3274bb 100644
--- a/net-dns/bind-tools/bind-tools-9.11.0_p5.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.0_p5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
@@ -44,6 +44,9 @@ S="${WORKDIR}/${MY_P}"
 RESTRICT="test"
 
 src_prepare() {
+	# bug 600212
+	epatch "${FILESDIR}"/${P}-dyndb-dlopen.patch
+
 	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
 
 	# Disable tests for now, bug 406399
diff --git a/net-dns/bind-tools/files/bind-tools-9.11.0_p5-dyndb-dlopen.patch b/net-dns/bind-tools/files/bind-tools-9.11.0_p5-dyndb-dlopen.patch
new file mode 100644
index 000000000000..5fc8f3c18897
--- /dev/null
+++ b/net-dns/bind-tools/files/bind-tools-9.11.0_p5-dyndb-dlopen.patch
@@ -0,0 +1,97 @@
+From ae903759c205f8a5039458d780c0e0c4442b7291 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 30 May 2017 11:31:34 +1000
+Subject: [PATCH] 4530.   [bug]           "dyndb" is dependent on dlopen
+ existing / being                         enabled. [RT #45291]
+
+From aa3a8979bc7eb1596d044eff572b3c35310584fa Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 30 May 2017 11:34:37 +1000
+Subject: [PATCH] 4530.   [bug]           "dyndb" is dependent on dlopen
+ existing / being                         enabled. [RT #45291]
+
+diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c
+index a477508..dec68a7 100644
+--- a/lib/dns/dyndb.c
++++ b/lib/dns/dyndb.c
+@@ -80,7 +80,7 @@ impfind(const char *name) {
+ 	return (NULL);
+ }
+ 
+-#if HAVE_DLFCN_H
++#if HAVE_DLFCN_H && HAVE_DLOPEN
+ static isc_result_t
+ load_symbol(void *handle, const char *filename,
+ 	    const char *symbol_name, void **symbolp)
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -1496,6 +1496,7 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
+ 	return (result);
+ }
+ 
++#ifdef HAVE_DLOPEN
+ static isc_result_t
+ configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx,
+ 		const dns_dyndbctx_t *dctx)
+@@ -1521,6 +1522,7 @@ configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx,
+ 			      name, isc_result_totext(result));
+ 	return (result);
+ }
++#endif
+ 
+ 
+ static isc_result_t
+@@ -4669,6 +4671,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
+ 	else
+ 		(void)cfg_map_get(config, "dyndb", &dyndb_list);
+ 
++#ifdef HAVE_DLOPEN
+ 	for (element = cfg_list_first(dyndb_list);
+ 	     element != NULL;
+ 	     element = cfg_list_next(element))
+@@ -4686,6 +4689,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
+ 
+ 		CHECK(configure_dyndb(dyndb, mctx, dctx));
+ 	}
++#endif
+ 
+ 	/*
+ 	 * Setup automatic empty zones.  If recursion is off then
+diff --git a/lib/bind9/check.c b/lib/bind9/check.c
+index 097dd96..99b995c 100644
+--- a/lib/bind9/check.c
++++ b/lib/bind9/check.c
+@@ -2988,6 +2988,9 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions,
+ {
+ 	const cfg_obj_t *zones = NULL;
+ 	const cfg_obj_t *keys = NULL;
++#ifndef HAVE_DLOPEN
++	const cfg_obj_t *dyndb = NULL;
++#endif
+ 	const cfg_listelt_t *element, *element2;
+ 	isc_symtab_t *symtab = NULL;
+ 	isc_result_t result = ISC_R_SUCCESS;
+@@ -3041,6 +3044,20 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions,
+ 			result = ISC_R_FAILURE;
+ 	}
+ 
++#ifndef HAVE_DLOPEN
++	if (voptions != NULL)
++		(void)cfg_map_get(voptions, "dyndb", &dyndb);
++	else
++		(void)cfg_map_get(config, "dyndb", &dyndb);
++
++	if (dyndb != NULL) {
++		cfg_obj_log(dyndb, logctx, ISC_LOG_ERROR,
++			    "dynamic loading of databases is not supported");
++		if (tresult != ISC_R_SUCCESS)
++			result = ISC_R_NOTIMPLEMENTED;
++	}
++#endif
++
+ 	/*
+ 	 * Check that the response-policy and catalog-zones options
+ 	 * refer to zones that exist.
+-- 
+2.9.0
+
diff --git a/net-dns/bind/bind-9.10.5.ebuild b/net-dns/bind/bind-9.10.5.ebuild
index 920c922aedd5..327332256282 100644
--- a/net-dns/bind/bind-9.10.5.ebuild
+++ b/net-dns/bind/bind-9.10.5.ebuild
@@ -38,7 +38,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb +caps dlz doc fetchlimit filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
 json ldap libressl mysql nslint odbc postgres python rpz seccomp selinux sit ssl static-libs
 +threads urandom xml"
diff --git a/net-dns/bind/bind-9.11.0_p5.ebuild b/net-dns/bind/bind-9.11.0_p5.ebuild
index 7b82a6732445..678d7c970434 100644
--- a/net-dns/bind/bind-9.11.0_p5.ebuild
+++ b/net-dns/bind/bind-9.11.0_p5.ebuild
@@ -38,7 +38,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
 json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
@@ -100,6 +100,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# bug 600212
+	epatch "${FILESDIR}"/${P}-dyndb-dlopen.patch
+
 	# Adjusting PATHs in manpages
 	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
 		sed -i \
diff --git a/net-dns/bind/files/bind-9.11.0_p5-dyndb-dlopen.patch b/net-dns/bind/files/bind-9.11.0_p5-dyndb-dlopen.patch
new file mode 100644
index 000000000000..5fc8f3c18897
--- /dev/null
+++ b/net-dns/bind/files/bind-9.11.0_p5-dyndb-dlopen.patch
@@ -0,0 +1,97 @@
+From ae903759c205f8a5039458d780c0e0c4442b7291 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 30 May 2017 11:31:34 +1000
+Subject: [PATCH] 4530.   [bug]           "dyndb" is dependent on dlopen
+ existing / being                         enabled. [RT #45291]
+
+From aa3a8979bc7eb1596d044eff572b3c35310584fa Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Tue, 30 May 2017 11:34:37 +1000
+Subject: [PATCH] 4530.   [bug]           "dyndb" is dependent on dlopen
+ existing / being                         enabled. [RT #45291]
+
+diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c
+index a477508..dec68a7 100644
+--- a/lib/dns/dyndb.c
++++ b/lib/dns/dyndb.c
+@@ -80,7 +80,7 @@ impfind(const char *name) {
+ 	return (NULL);
+ }
+ 
+-#if HAVE_DLFCN_H
++#if HAVE_DLFCN_H && HAVE_DLOPEN
+ static isc_result_t
+ load_symbol(void *handle, const char *filename,
+ 	    const char *symbol_name, void **symbolp)
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -1496,6 +1496,7 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
+ 	return (result);
+ }
+ 
++#ifdef HAVE_DLOPEN
+ static isc_result_t
+ configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx,
+ 		const dns_dyndbctx_t *dctx)
+@@ -1521,6 +1522,7 @@ configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx,
+ 			      name, isc_result_totext(result));
+ 	return (result);
+ }
++#endif
+ 
+ 
+ static isc_result_t
+@@ -4669,6 +4671,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
+ 	else
+ 		(void)cfg_map_get(config, "dyndb", &dyndb_list);
+ 
++#ifdef HAVE_DLOPEN
+ 	for (element = cfg_list_first(dyndb_list);
+ 	     element != NULL;
+ 	     element = cfg_list_next(element))
+@@ -4686,6 +4689,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
+ 
+ 		CHECK(configure_dyndb(dyndb, mctx, dctx));
+ 	}
++#endif
+ 
+ 	/*
+ 	 * Setup automatic empty zones.  If recursion is off then
+diff --git a/lib/bind9/check.c b/lib/bind9/check.c
+index 097dd96..99b995c 100644
+--- a/lib/bind9/check.c
++++ b/lib/bind9/check.c
+@@ -2988,6 +2988,9 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions,
+ {
+ 	const cfg_obj_t *zones = NULL;
+ 	const cfg_obj_t *keys = NULL;
++#ifndef HAVE_DLOPEN
++	const cfg_obj_t *dyndb = NULL;
++#endif
+ 	const cfg_listelt_t *element, *element2;
+ 	isc_symtab_t *symtab = NULL;
+ 	isc_result_t result = ISC_R_SUCCESS;
+@@ -3041,6 +3044,20 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions,
+ 			result = ISC_R_FAILURE;
+ 	}
+ 
++#ifndef HAVE_DLOPEN
++	if (voptions != NULL)
++		(void)cfg_map_get(voptions, "dyndb", &dyndb);
++	else
++		(void)cfg_map_get(config, "dyndb", &dyndb);
++
++	if (dyndb != NULL) {
++		cfg_obj_log(dyndb, logctx, ISC_LOG_ERROR,
++			    "dynamic loading of databases is not supported");
++		if (tresult != ISC_R_SUCCESS)
++			result = ISC_R_NOTIMPLEMENTED;
++	}
++#endif
++
+ 	/*
+ 	 * Check that the response-policy and catalog-zones options
+ 	 * refer to zones that exist.
+-- 
+2.9.0
+
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
index 7c95a11b60cb..89cad3b092e4 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc64 sparc x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 29f4bce61ae7..27e7f5255aff 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -4,3 +4,4 @@ DIST unbound-1.5.7.tar.gz 4859573 SHA256 4b2088e5aa81a2d48f6337c30c1cf7e99b2e2dc
 DIST unbound-1.5.8.tar.gz 4895649 SHA256 33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be SHA512 0c296a2e5489fae0fdf0ca2ea11ed72f00498c8499f38f308ff32078665d980a2d5a80ee0e106273dc13a146611a238553857c5f301fe9622072382c06b8434a WHIRLPOOL ca977c88e5dcca80d11a3cf769e002f61b8c6145dea2a79a9d0c142396ff2f19b3452546627ced79e9af74fed3ac2ff72ca9f6fc2395e477076959fef77bd3b1
 DIST unbound-1.5.9.tar.gz 4924965 SHA256 01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990 SHA512 a0f43a22d2c357b78482e5049fd77b100966964d861536169bd79379c02b96651e52c47f3f5001ac8e1ca474d41f784395adb44b61157487723f9f15287c97f4 WHIRLPOOL ccfeadbff8a450d431286d09b9c5bbcb40f53878ff33a3c36200485b5863279779bed55c1307586f59e5ccd7594f038e3b991bff401546b4969d564aa230b37d
 DIST unbound-1.6.0.tar.gz 5063253 SHA256 6b7db874e6debda742fee8869d722e5a17faf1086e93c911b8564532aeeffab7 SHA512 c92adee98ef759d033ac39784796e936e292f0671a42ad455411b82a9ba552744e4a0de432ee4ac05609dc0b429b70d5ce8169c20d3d65f4acf5afc5e02822ac WHIRLPOOL fc70f054718016df9c3fa502f25f44b57195d602ae0c53eb90fca5630ef96aa231f0e0b4c1bc3dfd012ee6c18c9dbd4e83f3aedc717adefd213f254105725870
+DIST unbound-1.6.2.tar.gz 5378826 SHA256 1a323d72c32180b7141c9e6ebf199fc68a0208dfebad4640cd2c4c27235e3b9c SHA512 ac7a4f7e6e857715bd047060ad27a36637ceaaea965fadea0124eb7d83a8bcffdf64723335ca4baf2428eefbd135909ed7a62530dc7f9fb68980726b4270a751 WHIRLPOOL 3cea267eb21c6f6d826bd08d4543998351b411808b69eebdf3c87334429a1a4fb4f34734e92492fec10642bb9176edaf76b084da053952d4a0f98fc0bc2b7806
diff --git a/net-dns/unbound/files/unbound.socket b/net-dns/unbound/files/unbound.socket
new file mode 100644
index 000000000000..0628064a4a5e
--- /dev/null
+++ b/net-dns/unbound/files/unbound.socket
@@ -0,0 +1,5 @@
+[Socket]
+ListenDatagram=127.0.0.1:1153
+ListenStream=127.0.0.1:1153
+[Install]
+WantedBy=sockets.target
diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index 272bb9804773..aa3ce165414e 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -26,6 +26,7 @@
   as a server, but are linked into an application) are easily possible.
   </longdescription>
   <use>
+    <flag name="dnscrypt">Enable DNSCrypt support</flag>
     <flag name="dnstap">Enable dnstap support</flag>
 	<flag name="ecdsa">Enable ECDSA support</flag>
     <flag name="gost">Enable GOST support</flag>
diff --git a/net-dns/unbound/unbound-1.6.2.ebuild b/net-dns/unbound/unbound-1.6.2.ebuild
new file mode 100644
index 000000000000..7b72e64ed4e6
--- /dev/null
+++ b/net-dns/unbound/unbound-1.6.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="http://unbound.net/"
+SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa gost libressl python selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# To avoid below error messages, set 'trust-anchor-file' to same value in
+	# 'auto-trust-anchor-file'.
+	# [23109:0] error: Could not open autotrust file for writing,
+	# /etc/dnssec/root-anchors.txt: Permission denied
+	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--with-libevent="${EPREFIX}"/usr \
+		--with-pidfile="${EPREFIX}"/var/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound.initd unbound
+	newconfd "${FILESDIR}"/unbound.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+}
diff --git a/net-fs/samba/samba-4.5.10.ebuild b/net-fs/samba/samba-4.5.10.ebuild
index cde455ac85ca..817231a74c85 100644
--- a/net-fs/samba/samba-4.5.10.ebuild
+++ b/net-fs/samba/samba-4.5.10.ebuild
@@ -16,7 +16,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r6.ebuild
index d5569f5e3209..402c7df871f3 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa"
 
 RDEPEND="
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild
index 49163f3bfa80..a31f258f10f8 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/libssh/libssh-0.7.4.ebuild b/net-libs/libssh/libssh-0.7.4.ebuild
index 4d84e7193b4c..a11813cc768b 100644
--- a/net-libs/libssh/libssh-0.7.4.ebuild
+++ b/net-libs/libssh/libssh-0.7.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.libssh.org/"
 SRC_URI="https://red.libssh.org/attachments/download/210/${MY_P}.tar.xz -> ${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
diff --git a/net-libs/libtirpc/libtirpc-1.0.1-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.1-r1.ebuild
index 55262b07f414..9791662277b2 100644
--- a/net-libs/libtirpc/libtirpc-1.0.1-r1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild
index 18ffa92bfe7f..557640dcbf71 100644
--- a/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/16"
-KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nghttp2/nghttp2-1.19.0.ebuild b/net-libs/nghttp2/nghttp2-1.19.0.ebuild
index f9f245e55409..4ad8c4f9b576 100644
--- a/net-libs/nghttp2/nghttp2-1.19.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.19.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/opal/opal-3.10.11-r1.ebuild b/net-libs/opal/opal-3.10.11-r1.ebuild
index 0fc6d24a2b74..8556b4709a73 100644
--- a/net-libs/opal/opal-3.10.11-r1.ebuild
+++ b/net-libs/opal/opal-3.10.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 
 LICENSE="MPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86"
 IUSE="celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
 ipv6 ivr java ldap libav lid +plugins sbc +sip +sipim +sound srtp ssl static-libs
 stats swig theora +video vpb vxml +wav x264 x264-static +xml"
diff --git a/net-libs/openslp/files/openslp-2.0.0-namespace.patch b/net-libs/openslp/files/openslp-2.0.0-namespace.patch
new file mode 100644
index 000000000000..b5e817877406
--- /dev/null
+++ b/net-libs/openslp/files/openslp-2.0.0-namespace.patch
@@ -0,0 +1,773 @@
+# HG changeset patch
+# User John Calcote <john.calcote@gmail.com>
+# Date 1491588156 21600
+#      Fri Apr 07 12:02:36 2017 -0600
+# Node ID 51ed69107d096c5b9886954d89e0709975d5aa15
+# Parent  c1c294ce953e35f757020b01314cfc49556ccc0c
+BUG#149: cleanup libslp namespace; fix ctype function calls throughout.
+
+diff -ruN openslp-2.0.0.orig/common/slp_compare.c openslp-2.0.0/common/slp_compare.c
+--- openslp-2.0.0.orig/common/slp_compare.c	2017-06-10 01:15:33.214875294 +0200
++++ openslp-2.0.0/common/slp_compare.c	2017-06-10 01:16:39.072878034 +0200
+@@ -83,9 +83,10 @@
+  *
+  * @internal
+  */
+-int strncasecmp(const char * s1, const char * s2, size_t len)
++int slp_strncasecmp(const char * s1, const char * s2, size_t len)
+ {
+-   while (*s1 && (*s1 == *s2 || tolower(*s1) == tolower(*s2)))
++   while (*s1 && (*s1 == *s2
++         || tolower((unsigned char)*s1) == tolower((unsigned char)*s2)))
+    {
+       len--;
+       if (len == 0)
+@@ -93,7 +94,7 @@
+       s1++;
+       s2++;
+    }
+-   return len? (int)(*(unsigned char *)s1 - (int)*(unsigned char *)s2): 0;
++   return len? (unsigned char)*s1 - (unsigned char)*s2: 0;
+ }
+ # endif
+ 
+@@ -113,11 +114,12 @@
+  *
+  * @internal
+  */
+-int strcasecmp(const char * s1, const char * s2)
++int slp_strcasecmp(const char * s1, const char * s2)
+ {
+-   while (*s1 && (*s1 == *s2 || tolower(*s1) == tolower(*s2)))
++   while (*s1 && (*s1 == *s2 
++         || tolower((unsigned char)*s1) == tolower((unsigned char)*s2)))
+       s1++, s2++;
+-   return (int)(*(unsigned char *)s1 - (int)*(unsigned char *)s2);
++   return (unsigned char)*s1 - (unsigned char)*s2;
+ }
+ # endif
+ #endif
+@@ -202,13 +204,13 @@
+    char * p = str, * ep = str + len;
+    while (p < ep)
+    {
+-      if (isspace(*p))
++      if (isspace((unsigned char)*p))
+       {
+-         char * ws2p = ++p;            /* Point ws2p to the second ws char. */
+-         while (p < ep && isspace(*p)) /* Scan till we hit a non-ws char. */
++         char * ws2p = ++p;                           /* Point ws2p to the second ws char. */
++         while (p < ep && isspace((unsigned char)*p)) /* Scan till we hit a non-ws char. */
+             p++;
+-         len -= p - ws2p;              /* Reduce the length by extra ws. */
+-         memmove(ws2p, p, ep - p);     /* Overwrite the extra white space. */
++         len -= p - ws2p;                             /* Reduce the length by extra ws. */
++         memmove(ws2p, p, ep - p);                    /* Overwrite the extra white space. */
+       }
+       p++;
+    }
+@@ -276,9 +278,9 @@
+    char *upd = dststr;
+    while (len > 0 && *srcstr)
+    {
+-      if (isspace(*srcstr))
++      if (isspace((unsigned char)*srcstr))
+       {
+-         while (isspace(*srcstr) && len > 0)
++         while (isspace((unsigned char)*srcstr) && len > 0)
+          {
+             ++srcstr, --len;
+          }
+@@ -311,7 +313,7 @@
+       }
+       else
+       {
+-         *upd++ = (char)tolower(*srcstr++);
++         *upd++ = (char)tolower((unsigned char)*srcstr++);
+          --len;
+       }
+    }
+@@ -340,15 +342,15 @@
+    char * cpy1, * cpy2;
+ 
+    /* Remove leading white space. */
+-   while (str1len && isspace(*str1))
++   while (str1len && isspace((unsigned char)*str1))
+       str1++, str1len--;
+-   while (str2len && isspace(*str2))
++   while (str2len && isspace((unsigned char)*str2))
+       str2++, str2len--;
+ 
+    /* Remove trailing white space. */
+-   while (str1len && isspace(str1[str1len - 1]))
++   while (str1len && isspace((unsigned char)str1[str1len - 1]))
+       str1len--;
+-   while (str2len && isspace(str2[str2len - 1]))
++   while (str2len && isspace((unsigned char)str2[str2len - 1]))
+       str2len--;
+ 
+    /*A quick check for empty strings before we start xmemduping and xfreeing*/
+diff -ruN openslp-2.0.0.orig/common/slp_compare.h openslp-2.0.0/common/slp_compare.h
+--- openslp-2.0.0.orig/common/slp_compare.h	2012-11-28 18:07:04.000000000 +0100
++++ openslp-2.0.0/common/slp_compare.h	2017-06-10 01:16:39.072878034 +0200
+@@ -52,10 +52,12 @@
+ 
+ #ifndef _WIN32
+ # ifndef HAVE_STRNCASECMP
+-int strncasecmp(const char * s1, const char * s2, size_t len);
++int slp_strncasecmp(const char * s1, const char * s2, size_t len);
++# define strncasecmp slp_strncasecmp
+ # endif
+ # ifndef HAVE_STRCASECMP
+-int strcasecmp(const char * s1, const char * s2);
++int slp_strcasecmp(const char * s1, const char * s2);
++# define strcasecmp slp_strcasecmp
+ # endif
+ #endif
+ 
+diff -ruN openslp-2.0.0.orig/common/slp_dhcp.c openslp-2.0.0/common/slp_dhcp.c
+--- openslp-2.0.0.orig/common/slp_dhcp.c	2012-12-07 01:52:08.000000000 +0100
++++ openslp-2.0.0/common/slp_dhcp.c	2017-06-10 01:16:39.073878034 +0200
+@@ -405,7 +405,7 @@
+  *    ENOTCONN (read error), ETIMEDOUT (read timeout), ENOMEM (out of
+  *    memory), or EINVAL (on parse error).
+  */
+-int DHCPGetOptionInfo(unsigned char * dhcpOptCodes, int dhcpOptCodeCnt, 
++int slp_DHCPGetOptionInfo(unsigned char * dhcpOptCodes, int dhcpOptCodeCnt, 
+       DHCPInfoCallBack * dhcpInfoCB, void * context)
+ {
+    uint32_t xid;
+@@ -539,7 +539,7 @@
+  * @return Zero on success, or a non-zero value to stop the caller from 
+  *    continuing to parse the buffer and call this routine.
+  */
+-int DHCPParseSLPTags(int tag, void * optdata, size_t optdatasz, 
++int slp_DHCPParseSLPTags(int tag, void * optdata, size_t optdatasz, 
+       void * context)
+ {
+    size_t cpysz, bufsz, dasize;
+@@ -707,8 +707,8 @@
+    ctx.scopelistlen = 0;
+    ctx.addrlistlen = 0;
+ 
+-   if ((err = DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), 
+-         DHCPParseSLPTags, &ctx)) != 0)
++   if ((err = slp_DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), 
++         slp_DHCPParseSLPTags, &ctx)) != 0)
+       return FAIL;
+ 
+    printf("ScopeList: [%.*s]\n", ctx.scopelistlen, ctx.scopelist);
+diff -ruN openslp-2.0.0.orig/common/slp_dhcp.h openslp-2.0.0/common/slp_dhcp.h
+--- openslp-2.0.0.orig/common/slp_dhcp.h	2012-11-28 18:07:04.000000000 +0100
++++ openslp-2.0.0/common/slp_dhcp.h	2017-06-10 01:16:39.073878034 +0200
+@@ -131,10 +131,10 @@
+ typedef int DHCPInfoCallBack(int tag, void * optdata, 
+       size_t optdatasz, void * context);
+ 
+-int DHCPGetOptionInfo(unsigned char * dhcpOptCodes, int dhcpOptCodeCnt, 
++int slp_DHCPGetOptionInfo(unsigned char * dhcpOptCodes, int dhcpOptCodeCnt, 
+       DHCPInfoCallBack * dhcpInfoCB, void * context);
+ 
+-int DHCPParseSLPTags(int tag, void * optdata, size_t optdatasz, 
++int slp_DHCPParseSLPTags(int tag, void * optdata, size_t optdatasz, 
+       void * context);
+ 
+ /** DHCP interface context structure */
+diff -ruN openslp-2.0.0.orig/common/slp_iface.c openslp-2.0.0/common/slp_iface.c
+--- openslp-2.0.0.orig/common/slp_iface.c	2012-12-11 00:31:53.000000000 +0100
++++ openslp-2.0.0/common/slp_iface.c	2017-06-10 01:16:39.073878034 +0200
+@@ -645,7 +645,7 @@
+  *
+  * @internal
+  */
+-int sizeof_ifreq(struct ifreq* ifr)
++static int sizeof_ifreq(struct ifreq* ifr)
+ {
+ #ifdef HAVE_SOCKADDR_STORAGE_SS_LEN
+   int len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name);
+diff -ruN openslp-2.0.0.orig/common/slp_message.c openslp-2.0.0/common/slp_message.c
+--- openslp-2.0.0.orig/common/slp_message.c	2012-12-11 00:31:53.000000000 +0100
++++ openslp-2.0.0/common/slp_message.c	2017-06-10 01:16:39.073878034 +0200
+@@ -58,7 +58,7 @@
+  * @return A 16-bit unsigned value in native format; the buffer pointer
+  *    is moved ahead by 2 bytes on return.
+  */
+-uint16_t GetUINT16(uint8_t ** cpp)
++uint16_t slp_GetUINT16(uint8_t ** cpp)
+ {
+    uint16_t rv = AS_UINT16(*cpp);
+    *cpp += 2;
+@@ -72,7 +72,7 @@
+  * @return A 32-bit unsigned value in native format; the buffer pointer
+  *    is moved ahead by 3 bytes on return.
+  */
+-uint32_t GetUINT24(uint8_t ** cpp)
++uint32_t slp_GetUINT24(uint8_t ** cpp)
+ {
+    uint32_t rv = AS_UINT24(*cpp);
+    *cpp += 3;
+@@ -86,7 +86,7 @@
+  * @return A 32-bit unsigned value in native format; the buffer pointer
+  *    is moved ahead by 4 bytes on return.
+  */
+-uint32_t GetUINT32(uint8_t ** cpp)
++uint32_t slp_GetUINT32(uint8_t ** cpp)
+ {
+    uint32_t rv = AS_UINT32(*cpp);
+    *cpp += 4;
+@@ -106,7 +106,7 @@
+  *    @p cppstring pointer; the buffer pointer is moved ahead by @p len bytes
+  *    on return.
+  */
+-char * GetStrPtr(uint8_t ** cpp, size_t len)
++char * slp_GetStrPtr(uint8_t ** cpp, size_t len)
+ {
+    char * sp = (char *)*cpp;
+    *cpp += len;
+@@ -120,7 +120,7 @@
+  *
+  * @note The buffer address is moved ahead by 2 bytes on return.
+  */
+-void PutUINT16(uint8_t ** cpp, size_t val)
++void slp_PutUINT16(uint8_t ** cpp, size_t val)
+ {
+    TO_UINT16(*cpp, val);
+    *cpp += 2;
+@@ -133,7 +133,7 @@
+  *
+  * @note The buffer address is moved ahead by 3 bytes on return.
+  */
+-void PutUINT24(uint8_t ** cpp, size_t val)
++void slp_PutUINT24(uint8_t ** cpp, size_t val)
+ {
+    TO_UINT24(*cpp, val);
+    *cpp += 3;
+@@ -146,7 +146,7 @@
+  *
+  * @note The buffer address is moved ahead by 4 bytes on return.
+  */
+-void PutUINT32(uint8_t ** cpp, size_t val)
++void slp_PutUINT32(uint8_t ** cpp, size_t val)
+ {
+    TO_UINT32(*cpp, val);
+    *cpp += 4;
+diff -ruN openslp-2.0.0.orig/common/slp_message.h openslp-2.0.0/common/slp_message.h
+--- openslp-2.0.0.orig/common/slp_message.h	2012-12-07 21:13:28.000000000 +0100
++++ openslp-2.0.0/common/slp_message.h	2017-06-10 01:16:39.073878034 +0200
+@@ -188,14 +188,23 @@
+ #define PEEK_LENGTH(p) ((*p == 2) ? AS_UINT24(p + 2) : (*p == 1) ? AS_UINT16(p + 2) : 1)
+ 
+ /* buffer-based wire routines */
+-uint16_t GetUINT16(uint8_t ** cpp);
+-uint32_t GetUINT24(uint8_t ** cpp);
+-uint32_t GetUINT32(uint8_t ** cpp);
+-char * GetStrPtr(uint8_t ** cpp, size_t length);
++uint16_t slp_GetUINT16(uint8_t ** cpp);
++uint32_t slp_GetUINT24(uint8_t ** cpp);
++uint32_t slp_GetUINT32(uint8_t ** cpp);
++char * slp_GetStrPtr(uint8_t ** cpp, size_t length);
+ 
+-void PutUINT16(uint8_t ** cpp, size_t val);
+-void PutUINT24(uint8_t ** cpp, size_t val);
+-void PutUINT32(uint8_t ** cpp, size_t val);
++void slp_PutUINT16(uint8_t ** cpp, size_t val);
++void slp_PutUINT24(uint8_t ** cpp, size_t val);
++void slp_PutUINT32(uint8_t ** cpp, size_t val);
++
++#define GetUINT16 slp_GetUINT16
++#define GetUINT24 slp_GetUINT24
++#define GetUINT32 slp_GetUINT32
++#define GetStrPtr slp_GetStrPtr
++
++#define PutUINT16 slp_PutUINT16
++#define PutUINT24 slp_PutUINT24
++#define PutUINT32 slp_PutUINT32
+ 
+ /** SLPHeader structure and associated functions */
+ typedef struct _SLPHeader
+diff -ruN openslp-2.0.0.orig/common/slp_net.c openslp-2.0.0/common/slp_net.c
+--- openslp-2.0.0.orig/common/slp_net.c	2012-12-11 00:31:53.000000000 +0100
++++ openslp-2.0.0/common/slp_net.c	2017-06-10 01:16:39.073878034 +0200
+@@ -76,18 +76,20 @@
+ #endif
+ 
+ /** IPv6 SLP address constants */
+-const struct in6_addr in6addr_srvloc_node       = IN6ADDR_SRVLOC_NODE_INIT;
+-const struct in6_addr in6addr_srvloc_link       = IN6ADDR_SRVLOC_LINK_INIT;
+-const struct in6_addr in6addr_srvloc_site       = IN6ADDR_SRVLOC_SITE_INIT;
+-const struct in6_addr in6addr_srvlocda_node     = IN6ADDR_SRVLDA_NODE_INIT;
+-const struct in6_addr in6addr_srvlocda_link     = IN6ADDR_SRVLDA_LINK_INIT;
+-const struct in6_addr in6addr_srvlocda_site     = IN6ADDR_SRVLDA_SITE_INIT;
+-const struct in6_addr in6addr_service_node_mask = IN6ADDR_SVCNOD_MASK_INIT;
+-const struct in6_addr in6addr_service_link_mask = IN6ADDR_SVCLNK_MASK_INIT;
+-const struct in6_addr in6addr_service_site_mask = IN6ADDR_SVCSIT_MASK_INIT;
+-const struct in6_addr slp_in6addr_any           = SLP_IN6ADDR_ANY_INIT;
+-const struct in6_addr slp_in6addr_loopback      = SLP_IN6ADDR_LOOPBACK_INIT;
++const struct in6_addr in6addr_srvloc_node   = IN6ADDR_SRVLOC_NODE_INIT;
++const struct in6_addr in6addr_srvloc_link   = IN6ADDR_SRVLOC_LINK_INIT;
++const struct in6_addr in6addr_srvloc_site   = IN6ADDR_SRVLOC_SITE_INIT;
+ 
++const struct in6_addr in6addr_srvlocda_node = IN6ADDR_SRVLDA_NODE_INIT;
++const struct in6_addr in6addr_srvlocda_link = IN6ADDR_SRVLDA_LINK_INIT;
++const struct in6_addr in6addr_srvlocda_site = IN6ADDR_SRVLDA_SITE_INIT;
++
++const struct in6_addr slp_in6addr_any      = SLP_IN6ADDR_ANY_INIT;
++const struct in6_addr slp_in6addr_loopback = SLP_IN6ADDR_LOOPBACK_INIT;
++
++static const struct in6_addr in6addr_service_node_mask = IN6ADDR_SVCNOD_MASK_INIT;
++static const struct in6_addr in6addr_service_link_mask = IN6ADDR_SVCLNK_MASK_INIT;
++static const struct in6_addr in6addr_service_site_mask = IN6ADDR_SVCSIT_MASK_INIT;
+ 
+ /** Returns the scope embedded in the IPv6 multicast address.
+  *
+diff -ruN openslp-2.0.0.orig/common/slp_net.h openslp-2.0.0/common/slp_net.h
+--- openslp-2.0.0.orig/common/slp_net.h	2012-12-11 00:31:53.000000000 +0100
++++ openslp-2.0.0/common/slp_net.h	2017-06-10 01:16:39.073878034 +0200
+@@ -65,9 +65,6 @@
+ extern const struct in6_addr in6addr_srvlocda_node;
+ extern const struct in6_addr in6addr_srvlocda_link;
+ extern const struct in6_addr in6addr_srvlocda_site;
+-extern const struct in6_addr in6addr_service_node_mask;
+-extern const struct in6_addr in6addr_service_link_mask;
+-/* extern const struct in6_addr in6addr_service_site_mask; */
+ 
+ /** IN6 "Any" and "Loopback" address initializer macros */
+ #ifdef _AIX
+diff -ruN openslp-2.0.0.orig/common/slp_network.c openslp-2.0.0/common/slp_network.c
+--- openslp-2.0.0.orig/common/slp_network.c	2013-06-08 04:50:38.000000000 +0200
++++ openslp-2.0.0/common/slp_network.c	2017-06-10 01:16:39.073878034 +0200
+@@ -364,7 +364,7 @@
+  * @returns A const pointer to @p dst on success; or NULL on failure, 
+  *    and sets @a errno to EAFNOSUPPORT.
+  */ 
+-const char * saddr_ntop(const void * src, char * dst, size_t dstsz)
++const char * slp_saddr_ntop(const void * src, char * dst, size_t dstsz)
+ {
+    switch (((const struct sockaddr *)src)->sa_family)
+    {
+diff -ruN openslp-2.0.0.orig/common/slp_network.h openslp-2.0.0/common/slp_network.h
+--- openslp-2.0.0.orig/common/slp_network.h	2012-11-28 18:07:04.000000000 +0100
++++ openslp-2.0.0/common/slp_network.h	2017-06-10 01:16:39.073878034 +0200
+@@ -62,7 +62,7 @@
+       size_t bufsz, void * peeraddr, struct timeval * timeout);  
+ int SLPNetworkRecvMessage(sockfd_t sockfd, int socktype, SLPBuffer * buf,
+       void * peeraddr, struct timeval * timeout); 
+-const char * saddr_ntop(const void * src, char * dst, size_t dstsz);
++const char * slp_saddr_ntop(const void * src, char * dst, size_t dstsz);
+ 
+ void SLPNetworkSetSndRcvBuf(sockfd_t sock);
+ /*! @} */
+diff -ruN openslp-2.0.0.orig/common/slp_v1message.c openslp-2.0.0/common/slp_v1message.c
+--- openslp-2.0.0.orig/common/slp_v1message.c	2012-12-11 00:31:53.000000000 +0100
++++ openslp-2.0.0/common/slp_v1message.c	2017-06-10 01:16:39.073878034 +0200
+@@ -275,10 +275,10 @@
+          || (tmp = strstr(srvreg->attrlist, "scope")) != 0)
+    {
+       tmp += 5;
+-      while (*tmp && (isspace(*tmp) || *tmp == '='))
++      while (*tmp && (isspace((unsigned char)*tmp) || *tmp == '='))
+          tmp++;      /* Find start of scope string. */
+       srvreg->scopelist = tmp;
+-      while (*tmp && !isspace(*tmp) && *tmp != ')')
++      while (*tmp && !isspace((unsigned char)*tmp) && *tmp != ')')
+          tmp++;      /* Find end of scope string. */
+       srvreg->scopelistlen = tmp - srvreg->scopelist;
+       /** @todo Should we convert to UTF-8 here? */
+diff -ruN openslp-2.0.0.orig/common/slp_xmalloc.c openslp-2.0.0/common/slp_xmalloc.c
+--- openslp-2.0.0.orig/common/slp_xmalloc.c	2017-06-10 01:15:33.209875294 +0200
++++ openslp-2.0.0/common/slp_xmalloc.c	2017-06-10 01:18:31.228882700 +0200
+@@ -106,7 +106,7 @@
+  *
+  * @return A pointer to the newly allocated memory block.
+  */
+-void * _xmalloc(const char * file, int line, size_t size)
++void * slp_xmalloc(const char * file, int line, size_t size)
+ {
+    xallocation_t * x;
+ 
+@@ -161,10 +161,10 @@
+  *
+  * @return A pointer to the newly allocated and cleared memory block.
+  */
+-void * _xcalloc(const char * file, int line, int numblks, size_t size)
++void * slp_xcalloc(const char * file, int line, int numblks, size_t size)
+ {
+    size_t blksz = numblks * size;
+-   void * ptr = _xmalloc(file, line, blksz);
++   void * ptr = slp_xmalloc(file, line, blksz);
+    if (ptr)
+       memset(ptr, 0, blksz);
+    return ptr;
+@@ -183,16 +183,16 @@
+  *    NULL for @p buf actually allocates a new buffer, passing 0 
+  *    for @p size actually allocates a new buffer.
+  */
+-void * _xrealloc(const char * file, int line, void * ptr, size_t size)
++void * slp_xrealloc(const char * file, int line, void * ptr, size_t size)
+ {
+    xallocation_t * x;
+ 
+    if (!ptr)
+-      return _xmalloc(file, line, size);
++      return slp_xmalloc(file, line, size);
+ 
+    if (!size)
+    {
+-      _xfree(file, line, ptr);
++      slp_xfree(file, line, ptr);
+       return 0;
+    }
+ 
+@@ -202,11 +202,11 @@
+       void * newptr = ptr;
+       if (x->size != size)
+       {
+-         newptr = _xmalloc(file, line, size);
++         newptr = slp_xmalloc(file, line, size);
+          if (newptr == 0)
+             return 0;
+          memcpy(newptr, ptr, x->size);
+-         _xfree(file, line, x);
++         slp_xfree(file, line, x);
+       }
+       return newptr;
+    }
+@@ -227,10 +227,10 @@
+  * @return A pointer to the duplicated string, or NULL on memory
+  *    allocation failure.
+  */
+-char * _xstrdup(const char * file, int line, const char * str)
++char * slp_xstrdup(const char * file, int line, const char * str)
+ {
+    size_t strsz = strlen(str) + 1;
+-   char * ptr = _xmalloc(file, line, strsz);
++   char * ptr = slp_xmalloc(file, line, strsz);
+    if (ptr)
+       memcpy(ptr, str, strsz);
+    return ptr;
+@@ -246,9 +246,9 @@
+  * @return A pointer to the duplicated memory block, or NULL on memory
+  *    allocation failure.
+  */
+-void * _xmemdup(const char * file, int line, const void * ptr, size_t size)
++void * slp_xmemdup(const char * file, int line, const void * ptr, size_t size)
+ {
+-   void * cpy = _xmalloc(file, line, size);
++   void * cpy = slp_xmalloc(file, line, size);
+    if (cpy)
+       memcpy(cpy, ptr, size);
+    return cpy;
+@@ -260,7 +260,7 @@
+  * @param[in] line - The line number where @e xfree was called.
+  * @param[in] ptr - The address of the block to be free'd.
+  */
+-void _xfree(const char * file, int line, void * ptr)
++void slp_xfree(const char * file, int line, void * ptr)
+ {
+    xallocation_t * x;
+ 
+@@ -292,7 +292,7 @@
+  * @return A boolean true (1) on success, or false (0) the log file 
+  *    fails to open.
+ */
+-int xmalloc_init(const char * filename, size_t freemem)
++int slp_xmalloc_init(const char * filename, size_t freemem)
+ {
+    G_xmalloc_fh = fopen(filename, "w");
+    if (G_xmalloc_fh == 0)
+@@ -305,7 +305,7 @@
+  *
+  * @return 0
+  */
+-int xmalloc_report(void)
++int slp_xmalloc_report(void)
+ {
+    xallocation_t * x;
+ 
+@@ -327,7 +327,7 @@
+ 
+ /** Deinitialize the debug memory allocator.
+  */
+-void xmalloc_deinit(void)
++void slp_xmalloc_deinit(void)
+ {
+    xmalloc_report();
+ 
+@@ -352,7 +352,7 @@
+  * @return A pointer to the duplicated memory block, or NULL on memory
+  *    allocation failure.
+  */
+-void * _xmemdup(const void * ptr, size_t size)
++void * slp_xmemdup(const void * ptr, size_t size)
+ {
+    void * cpy = malloc(size);
+    if (cpy)
+diff -ruN openslp-2.0.0.orig/common/slp_xmalloc.h openslp-2.0.0/common/slp_xmalloc.h
+--- openslp-2.0.0.orig/common/slp_xmalloc.h	2012-11-28 18:07:04.000000000 +0100
++++ openslp-2.0.0/common/slp_xmalloc.h	2017-06-10 01:16:39.073878034 +0200
+@@ -63,34 +63,38 @@
+    size_t size;
+ } xallocation_t;
+ 
+-void * _xmalloc(const char * file, int line, size_t size);
+-void * _xcalloc(const char * file, int line, int numblks, size_t size);
+-void * _xrealloc(const char * file, int line, void * ptr, size_t size);
+-char * _xstrdup(const char * file, int line, const char * str);
+-void * _xmemdup(const char * file, int line, const void * ptr, size_t size);
+-void   _xfree(const char * file, int line, void * ptr);
+-
+-int xmalloc_init(const char * filename, size_t freemem);
+-int xmalloc_report(void);
+-void xmalloc_deinit(void);
+-
+-#define xmalloc(s)      _xmalloc(__FILE__,__LINE__,(s))
+-#define xcalloc(n,s)    _xcalloc(__FILE__,__LINE__,(n),(s))
+-#define xrealloc(p,s)   _xrealloc(__FILE__,__LINE__,(p),(s))
+-#define xfree(p)        _xfree(__FILE__,__LINE__,(p))
+-#define xstrdup(p)      _xstrdup(__FILE__,__LINE__,(p))
+-#define xmemdup(p,s)    _xmemdup(__FILE__,__LINE__,(p),(s))
++void * slp_xmalloc(const char * file, int line, size_t size);
++void * slp_xcalloc(const char * file, int line, int numblks, size_t size);
++void * slp_xrealloc(const char * file, int line, void * ptr, size_t size);
++char * slp_xstrdup(const char * file, int line, const char * str);
++void * slp_xmemdup(const char * file, int line, const void * ptr, size_t size);
++void   slp_xfree(const char * file, int line, void * ptr);
++
++int slp_xmalloc_init(const char * filename, size_t freemem);
++int slp_xmalloc_report(void);
++void slp_xmalloc_deinit(void);
++
++#define xmalloc(s)      slp_xmalloc(__FILE__,__LINE__,(s))
++#define xcalloc(n,s)    slp_xcalloc(__FILE__,__LINE__,(n),(s))
++#define xrealloc(p,s)   slp_xrealloc(__FILE__,__LINE__,(p),(s))
++#define xfree(p)        slp_xfree(__FILE__,__LINE__,(p))
++#define xstrdup(p)      slp_xstrdup(__FILE__,__LINE__,(p))
++#define xmemdup(p,s)    slp_xmemdup(__FILE__,__LINE__,(p),(s))
++
++#define xmalloc_init    slp_xmalloc_init
++#define xmalloc_report  slp_xmalloc_report
++#define xmalloc_deinit  slp_xmalloc_deinit
+ 
+ #else    /* ?DEBUG */
+ 
+-void * _xmemdup(const void * ptr, size_t srclen);
++void * slp_xmemdup(const void * ptr, size_t srclen);
+ 
+ #define xmalloc   malloc
+ #define xcalloc   calloc
+ #define xrealloc  realloc
+ #define xfree     free
+ #define xstrdup   strdup
+-#define xmemdup   _xmemdup
++#define xmemdup   slp_xmemdup
+ 
+ #endif   /* ?DEBUG */
+ 
+diff -ruN openslp-2.0.0.orig/libslp/libslp.h openslp-2.0.0/libslp/libslp.h
+--- openslp-2.0.0.orig/libslp/libslp.h	2012-11-28 18:07:04.000000000 +0100
++++ openslp-2.0.0/libslp/libslp.h	2017-06-10 01:16:39.073878034 +0200
+@@ -263,11 +263,15 @@
+ 
+ void KnownDAFreeAll(void);
+ 
+-void PutL16String(uint8_t ** cpp, const char * str, size_t strsz);
+-size_t SizeofURLEntry(size_t urllen, size_t urlauthlen);
+-void PutURLEntry(uint8_t ** cpp, uint16_t lifetime, const char * url,
++void slp_PutL16String(uint8_t ** cpp, const char * str, size_t strsz);
++size_t slp_SizeofURLEntry(size_t urllen, size_t urlauthlen);
++void slp_PutURLEntry(uint8_t ** cpp, uint16_t lifetime, const char * url,
+       size_t urllen, const uint8_t * urlauth, size_t urlauthlen);
+ 
++#define PutL16String   slp_PutL16String
++#define SizeofURLEntry slp_SizeofURLEntry
++#define PutURLEntry    slp_PutURLEntry
++
+ int LIBSLPPropertyInit(char const * gconffile);
+ void LIBSLPPropertyCleanup();
+ 
+diff -ruN openslp-2.0.0.orig/libslp/libslp_knownda.c openslp-2.0.0/libslp/libslp_knownda.c
+--- openslp-2.0.0.orig/libslp/libslp_knownda.c	2012-12-12 18:38:52.000000000 +0100
++++ openslp-2.0.0/libslp/libslp_knownda.c	2017-06-10 01:16:39.074878034 +0200
+@@ -520,7 +520,7 @@
+    *ctx.scopelist = 0;
+    ctx.addrlistlen = 0;
+ 
+-   DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), DHCPParseSLPTags, &ctx);
++   slp_DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), slp_DHCPParseSLPTags, &ctx);
+ 
+    if (!*ctx.scopelist)
+    {
+diff -ruN openslp-2.0.0.orig/libslp/libslp_network.c openslp-2.0.0/libslp/libslp_network.c
+--- openslp-2.0.0.orig/libslp/libslp_network.c	2013-06-08 04:50:38.000000000 +0200
++++ openslp-2.0.0/libslp/libslp_network.c	2017-06-10 01:16:39.074878034 +0200
+@@ -142,7 +142,7 @@
+  *
+  * @internal
+  */
+-void timeval_subtract(struct timeval *lhs, struct timeval *rhs)
++static void timeval_subtract(struct timeval *lhs, struct timeval *rhs)
+ {
+     lhs->tv_sec -= rhs->tv_sec;
+     lhs->tv_usec -= rhs->tv_usec;
+@@ -162,7 +162,7 @@
+  *
+  * @internal
+  */
+-void timeval_add(struct timeval *lhs, struct timeval *rhs)
++static void timeval_add(struct timeval *lhs, struct timeval *rhs)
+ {
+     lhs->tv_sec += rhs->tv_sec;
+     lhs->tv_usec += rhs->tv_usec;
+@@ -183,7 +183,7 @@
+  *
+  * @return the size
+  */
+-size_t CalcBufferSize(int v1, char buftype, size_t langsize, size_t prlistlen, size_t bufsize)
++static size_t CalcBufferSize(int v1, char buftype, size_t langsize, size_t prlistlen, size_t bufsize)
+ {
+    size_t size = 0;
+ 
+diff -ruN openslp-2.0.0.orig/libslp/libslp_parse.c openslp-2.0.0/libslp/libslp_parse.c
+--- openslp-2.0.0.orig/libslp/libslp_parse.c	2012-12-11 00:31:53.000000000 +0100
++++ openslp-2.0.0/libslp/libslp_parse.c	2017-06-10 01:16:39.074878034 +0200
+@@ -102,10 +102,10 @@
+  *    next buffer position after the URL Entry written on exit.
+  *
+  * @remarks Currently OpenSLP only handles a single authentication
+- *    block. To handle more than this, PutURLEntry would have to take
++ *    block. To handle more than this, slp_PutURLEntry would have to take
+  *    arrays of @p urlauth and @p urlauthlen values.
+  */
+-void PutURLEntry(uint8_t ** cpp, uint16_t lifetime, const char * url,
++void slp_PutURLEntry(uint8_t ** cpp, uint16_t lifetime, const char * url,
+       size_t urllen, const uint8_t * urlauth, size_t urlauthlen)
+ {
+    uint8_t * curpos = *cpp;
+diff -ruN openslp-2.0.0.orig/libslpattr/libslpattr.c openslp-2.0.0/libslpattr/libslpattr.c
+--- openslp-2.0.0.orig/libslpattr/libslpattr.c	2012-12-11 00:31:53.000000000 +0100
++++ openslp-2.0.0/libslpattr/libslpattr.c	2017-06-10 01:16:39.074878034 +0200
+@@ -134,8 +134,8 @@
+  */
+ static char unescape(char d1, char d2)
+ {
+-   SLP_ASSERT(isxdigit((int) d1));
+-   SLP_ASSERT(isxdigit((int) d2));
++   SLP_ASSERT(isxdigit((unsigned char)d1));
++   SLP_ASSERT(isxdigit((unsigned char)d2));
+ 
+    if ((d1 >= 'A') && (d1 <= 'F'))
+       d1 = d1 - 'A' + 0x0A;
+@@ -184,8 +184,8 @@
+          /*** Check that the characters are legal, and that the value has
+           * not been truncated.
+           ***/
+-         if ((i + 2 < len) && isxdigit((int) src[i + 1]) && isxdigit((int)
+-                                                                  src[i + 2]))
++         if ((i + 2 < len) && isxdigit((unsigned char)src[i + 1]) 
++               && isxdigit((unsigned char)src[i + 2]))
+          {
+             *write = unescape(src[i + 1], src[i + 2]);
+             i += 2;
+@@ -2049,14 +2049,14 @@
+ 
+ 
+    /***** Check integer *****/
+-   if (*val == '-' || isdigit((int) * val))
++   if (*val == '-' || isdigit((unsigned char)*val))
+    {
+       /*** Verify. ***/
+       SLPBoolean is_int = SLP_TRUE; /* Flag true if the attr is an int. */
+       for (i = 1; i < len; i++)
+       {
+          /* We start at 1 since first char has already been checked. */
+-         if (!isdigit((int) val[i]))
++         if (!isdigit((unsigned char)val[i]))
+          {
+             is_int = SLP_FALSE;
+             break;
+diff -ruN openslp-2.0.0.orig/slpd/slpd_knownda.c openslp-2.0.0/slpd/slpd_knownda.c
+--- openslp-2.0.0.orig/slpd/slpd_knownda.c	2012-12-11 00:31:53.000000000 +0100
++++ openslp-2.0.0/slpd/slpd_knownda.c	2017-06-10 01:16:39.074878034 +0200
+@@ -488,7 +488,7 @@
+    *ctx.scopelist = 0;
+    ctx.addrlistlen = 0;
+ 
+-   DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), DHCPParseSLPTags, &ctx);
++   slp_DHCPGetOptionInfo(dhcpOpts, sizeof(dhcpOpts), slp_DHCPParseSLPTags, &ctx);
+ 
+    alp = ctx.addrlist;
+    while (ctx.addrlistlen >= 4)
+diff -ruN openslp-2.0.0.orig/slpd/slpd_main.c openslp-2.0.0/slpd/slpd_main.c
+--- openslp-2.0.0.orig/slpd/slpd_main.c	2012-12-11 00:31:53.000000000 +0100
++++ openslp-2.0.0/slpd/slpd_main.c	2017-06-10 01:16:39.074878034 +0200
+@@ -358,10 +358,11 @@
+    if (fd)
+    {
+       memset(pidstr,0,14);
+-      (void)fread(pidstr,13,1,fd);
+-      pid = atoi(pidstr);
+-      if (pid && kill(pid, 0) == 0)
+-         return -1;  /* we are already running */
++      if (fread(pidstr,13,1,fd) > 0) {
++         pid = atoi(pidstr);
++         if (pid && kill(pid, 0) == 0)
++            return -1;  /* we are already running */
++      }
+       fclose(fd);
+    }
+    return 0;
+@@ -449,7 +450,8 @@
+       int i;
+ 
+       /* change directory to root */
+-      (void)chdir("/");
++      if (chdir("/") != 0)
++         ; /* TODO: ... */
+ 
+       /* close all open file handles */
+       for (i = 0; i < 8192; i++)
+diff -ruN openslp-2.0.0.orig/slpd/slpd_predicate.c openslp-2.0.0/slpd/slpd_predicate.c
+--- openslp-2.0.0.orig/slpd/slpd_predicate.c	2012-12-11 00:31:53.000000000 +0100
++++ openslp-2.0.0/slpd/slpd_predicate.c	2017-06-10 01:16:39.075878034 +0200
+@@ -161,7 +161,7 @@
+       /* Verify escape sequences. */
+       if (seq_pos == 1 || seq_pos == 2)
+       {
+-         if (!isxdigit((int) escaped[i]))
++         if (!isxdigit((unsigned char)escaped[i]))
+             return 0;
+ 
+          if (seq_pos == 2)
+@@ -198,7 +198,7 @@
+  */
+ static int unescape_check(char d1, char d2, char * val) 
+ {
+-   if (!isxdigit((int) d1) || !isxdigit((int) d2))
++   if (!isxdigit((unsigned char)d1) || !isxdigit((unsigned char)d2))
+       return 0;
+ 
+    if ((d1 >= 'A') && (d1 <= 'F'))
+@@ -285,10 +285,10 @@
+ 
+       if (unesc != verbatim[ver_i])        /* quick check for equality*/
+       {
+-         if (!isascii(unesc)         /* case insensitive check */
+-               || !isalpha(unesc)
+-               || !isalpha(verbatim[ver_i])
+-               || tolower(unesc) != tolower(verbatim[ver_i]))
++         if (!isascii((unsigned char)unesc)         /* case insensitive check */
++               || !isalpha((unsigned char)unesc)
++               || !isalpha((unsigned char)verbatim[ver_i])
++               || tolower((unsigned char)unesc) != tolower((unsigned char)verbatim[ver_i]))
+             return FR_EVAL_FALSE;
+       }
+ 
+@@ -866,7 +866,7 @@
+    int i;
+ 
+    for (i = 0; str[i] != 0; i++)
+-      if (!((!isdigit((int) str[i])) || str[i] == '-'))
++      if (!((!isdigit((unsigned char)str[i])) || str[i] == '-'))
+          return 0;
+ 
+    return 1;
diff --git a/net-libs/openslp/openslp-2.0.0-r1.ebuild b/net-libs/openslp/openslp-2.0.0-r1.ebuild
deleted file mode 100644
index eb8e4ee2ecf9..000000000000
--- a/net-libs/openslp/openslp-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools systemd
-
-DESCRIPTION="An open-source implementation of Service Location Protocol"
-HOMEPAGE="http://www.openslp.org/"
-SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="libressl"
-RESTRICT="test"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.0-cflags.patch
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
-	rm -rfv "${D}"/usr/doc
-	dohtml -r .
-	newinitd "${FILESDIR}"/slpd-init slpd
-	systemd_dounit "${FILESDIR}"/slpd.service
-}
diff --git a/net-libs/openslp/openslp-2.0.0-r2.ebuild b/net-libs/openslp/openslp-2.0.0-r2.ebuild
deleted file mode 100644
index 7830969bc71e..000000000000
--- a/net-libs/openslp/openslp-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="An open-source implementation of Service Location Protocol"
-HOMEPAGE="http://www.openslp.org/"
-SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="libressl"
-RESTRICT="test"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-cflags.patch
-	"${FILESDIR}"/${PN}-2.0.0-CVE-2016-4912.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
-	rm -rfv "${D}"/usr/doc
-	dohtml -r .
-	newinitd "${FILESDIR}"/slpd-init slpd
-	systemd_dounit "${FILESDIR}"/slpd.service
-}
diff --git a/net-libs/openslp/openslp-2.0.0-r3.ebuild b/net-libs/openslp/openslp-2.0.0-r5.ebuild
similarity index 92%
rename from net-libs/openslp/openslp-2.0.0-r3.ebuild
rename to net-libs/openslp/openslp-2.0.0-r5.ebuild
index 961503ab7260..db368f045b14 100644
--- a/net-libs/openslp/openslp-2.0.0-r3.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r5.ebuild
@@ -25,6 +25,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.0-cflags.patch
 	"${FILESDIR}"/${PN}-2.0.0-CVE-2016-4912.patch
 	"${FILESDIR}"/${PN}-2.0.0-CVE-2012-4428.patch
+	"${FILESDIR}"/${PN}-2.0.0-CVE-2016-7567.patch
+	"${FILESDIR}"/${PN}-2.0.0-namespace.patch
 )
 
 src_prepare() {
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild
index 569ac78c7ce0..eccc00523bbd 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.1.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://cwrap.org/socket_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/net-mail/courier-imap/courier-imap-4.17.3.ebuild b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
index abbf81206cec..080a6590964b 100644
--- a/net-mail/courier-imap/courier-imap-4.17.3.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild
index cf8b9b630bd3..405b66e727c1 100644
--- a/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p10-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-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 ~m68k-mint"
+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 ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 0ad70a13030d..fea58b792299 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -7,6 +7,7 @@ DIST openssh-7.4_p1-sctp.patch.xz 8220 SHA256 18fa77f79ccae8b9a76bc877e9602113d9
 DIST openssh-7.4p1+x509-9.3.diff.gz 446572 SHA256 1d3fd23b3d02a3baad50890bf5498ef01af6dab6375da0aeb00a0d59fd3ac9ee SHA512 7ebc8d1f6ec36d652bbb6fb13d6d86f7db1abf8710af7b56c52fad9a18d73c9028a3307daabfdda26483a3bd9196120f6d18b6fb2c89b597b0a9ad0554161dfc WHIRLPOOL f878346a3154b7dbb01de41830d5857064af96d3a709aed40a112fe9aaadbe4801e5c3a22a1d2c8437b74a890596211be37e26d691ff611981d7375d262598c1
 DIST openssh-7.4p1.tar.gz 1511780 SHA256 1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1 SHA512 4f3256f461f01366c5d5e0e45285eec65016e2643b3284b407f48f53d81087bf2c1caf7d5f7530d307a15c91c64de91446e1cba948e8fc68f82098290fe3b292 WHIRLPOOL 4ed9a277287d1f5c2fd371b53394d6dde36b25adf92d4b6b5b486a9d448648f2ecfbb721ae39ba8a129913c1148aa4db1e99f7960a7c69fa215dfa7b3b126029
 DIST openssh-7.5p1+x509-10.1.diff.gz 460721 SHA256 e7abe401e7f651779c680491cfefbfcf4f26743202641b2bda934f80bb4464d2 SHA512 d3b5a8f5e3a88eda7989b002236811867b7e2c39bf7cd29a6dbbce277fca3fbedbfdbeaf1fba7d8c19f3dea32a17790e90604765f18576bcc5627a9c1d39109c WHIRLPOOL 2d4f96b47bcde9eabd19cad2fdc4da01a3d207f6ad5f4f1ea5a7dbd708d61783ae6a53e4cb622feed838106f57dbe6a7ecd1b41426325870378caf44803ff9ef
+DIST openssh-7.5p1+x509-10.2.diff.gz 467040 SHA256 24d5c1949d245b432abf2db6c28554a09bcffdcb4f4247826c0a33bdbee8b92c SHA512 ec760d38771749d09afc8d720120ea2aa065c1c7983898b45dba74a4411f7e61e7705da226864e1e8e62e2261eecc3a4ab654b528c71512a07798824d9fb1a9a WHIRLPOOL 3291a3e39b1a47efe149cdf805de11217fd55c4260477f2a6c6cc0bfa376b98a5dc7f56a49ae184fb57bae6226c73d1794db7b2285e3ea26a8fea4bc9304655b
 DIST openssh-7.5p1-hpnssh14v12.tar.xz 23068 SHA256 8a1ed99c121a4ad21d7a26cd32627a8dd51595fd3ee9f95dc70e6b50fe779ce2 SHA512 45c42090a212b9ce898fbaa8284ddf0f0d17236af13c4a780e00bf265b0c7a4286027e90a7ce9ad70066309db722709dd2f0a7914f57e5364ffbaf7c4859cdf9 WHIRLPOOL 6089ad8ae16c112a6f15d168c092e7f057b9e6d815724346b5a6a1cd0de932f779d5f410d48c904d935fcb3bad3f597fa4de075ab1f49cadc9842ce7bd8fdf42
 DIST openssh-7.5p1.tar.gz 1510857 SHA256 9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 SHA512 58c542e8a110fb4316a68db94abb663fa1c810becd0638d45281df8aeca62c1f705090437a80e788e6c29121769b72a505feced537d3118c933fde01b5285c81 WHIRLPOOL 1a42c68d8e350bc4790dd4c1a98dd6571bfa353ad6871b1462c53b6412f752719daabd1a13bb4434d294de966a00428ac66334bab45f371420029b5e34a6914c
 DIST openssh-lpk-7.3p1-0.3.14.patch.xz 17800 SHA256 cf1f60235cb8b0e561cd36cbf9e4f437e16fd748c2616d3f511c128c02deb76c SHA512 e9a73c5f13e41f6e11c744fdbcdb2e399c394479f79249e901cb3c101efb06f23d51d3ba4869db872184fa034a5910fc93a730fe906266c8d7409e39ad5b1ecd WHIRLPOOL bbdeadbed8f901148713bd9e4a082a4be2992c3151f995febd8be89bbb85d91185e1f0413b5a94a9340f2f404d18c9cee2aa6e032adaee0306aa1c624f6cc09c
diff --git a/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.2-glue.patch b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.2-glue.patch
new file mode 100644
index 000000000000..11a5b364be4d
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.2-glue.patch
@@ -0,0 +1,67 @@
+diff -ur a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch
+--- a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch	2017-03-27 13:31:01.816551100 -0700
++++ b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch	2017-03-27 13:51:03.894805846 -0700
+@@ -40,7 +40,7 @@
+ @@ -44,7 +44,7 @@ CC=@CC@
+  LD=@LD@
+  CFLAGS=@CFLAGS@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -1023,6 +1023,3 @@
+  	do_authenticated(authctxt);
+  
+  	/* The connection has been terminated. */
+--- 
+-2.12.0
+-
+diff -ur a/0004-support-dynamically-sized-receive-buffers.patch b/0004-support-dynamically-sized-receive-buffers.patch
+--- a/0004-support-dynamically-sized-receive-buffers.patch	2017-03-27 13:31:01.816551100 -0700
++++ b/0004-support-dynamically-sized-receive-buffers.patch	2017-03-27 13:49:44.513498976 -0700
+@@ -926,9 +926,9 @@
+ @@ -526,10 +553,10 @@ send_client_banner(int connection_out, int minor1)
+  	/* Send our own protocol version identification. */
+  	if (compat20) {
+- 		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
+--		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+-+		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
++		xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
++-		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
+++		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
+  	} else {
+  		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
+ -		    PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
+@@ -943,11 +943,11 @@
+ @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
+  	char remote_version[256];	/* Must be at least as big as buf. */
+  
+- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
+--	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
+-+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
++	xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s%s",
++-	    major, minor, SSH_VERSION, pkix_comment,
+++	    major, minor, SSH_RELEASE, pkix_comment,
+  	    *options.version_addendum == '\0' ? "" : " ",
+- 	    options.version_addendum);
++ 	    options.version_addendum, newline);
+  
+ @@ -1020,6 +1020,8 @@ server_listen(void)
+  	int ret, listen_sock, on = 1;
+@@ -1006,12 +1008,9 @@
+ --- a/version.h
+ +++ b/version.h
+-@@ -3,4 +3,5 @@
++@@ -3,4 +3,6 @@
+  #define SSH_VERSION	"OpenSSH_7.5"
+  
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
++-#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+++#define SSH_X509	", PKIX-SSH " PACKAGE_VERSION
+ +#define SSH_HPN		"-hpn14v12"
+ +#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+--- 
+-2.12.0
+-
diff --git a/net-misc/openssh/openssh-7.5_p1-r1.ebuild b/net-misc/openssh/openssh-7.5_p1-r1.ebuild
index 9abe3afa4fdf..f489805ca414 100644
--- a/net-misc/openssh/openssh-7.5_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
diff --git a/net-misc/openssh/openssh-7.5_p1-r2.ebuild b/net-misc/openssh/openssh-7.5_p1-r2.ebuild
new file mode 100644
index 000000000000..4a79f547cf75
--- /dev/null
+++ b/net-misc/openssh/openssh-7.5_p1-r2.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
+SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz"
+X509_VER="10.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		if use hpn ; then
+			pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
+			popd >/dev/null
+		fi
+		save_version X509
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		use libressl && epatch "${FILESDIR}"/${PN}-7.5p1-x509-libressl.patch
+	fi
+
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
+	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
+	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
+	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use X509 || use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/tigervnc/tigervnc-1.8.0.ebuild b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
index 42c6c04fee13..85c3e1a85401 100644
--- a/net-misc/tigervnc/tigervnc-1.8.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
 IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
 
 CDEPEND="virtual/jpeg:0
diff --git a/net-nds/rpcbind/rpcbind-0.2.4-r1.ebuild b/net-nds/rpcbind/rpcbind-0.2.4-r1.ebuild
index 65fe2a2df2bd..9afcf79d3283 100644
--- a/net-nds/rpcbind/rpcbind-0.2.4-r1.ebuild
+++ b/net-nds/rpcbind/rpcbind-0.2.4-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="portmap replacement which supports RPC over various protocols"
diff --git a/net-print/cups-filters/cups-filters-1.13.5.ebuild b/net-print/cups-filters/cups-filters-1.13.5.ebuild
index 5b3dbd5ec6cc..892890472ce2 100644
--- a/net-print/cups-filters/cups-filters-1.13.5.ebuild
+++ b/net-print/cups-filters/cups-filters-1.13.5.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups PDF filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format"
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
index 14dfcfcf4606..51fae9f2067e 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="net-print/cups
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
index 093070810ecf..831c507b34a3 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
index 661ac4a3d5bd..35042585b019 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/net-proxy/privoxy/privoxy-3.0.26.ebuild b/net-proxy/privoxy/privoxy-3.0.26.ebuild
index c04478cc7be3..cb4d25e756b4 100644
--- a/net-proxy/privoxy/privoxy-3.0.26.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.26.ebuild
@@ -18,7 +18,7 @@ external-filters +fast-redirects +force graceful-termination
 ie-images +image-blocking ipv6 lfs png-images selinux +stats
 +threads toggle tools whitelists +zlib"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 LICENSE="GPL-2"
 
 DEPEND="
diff --git a/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild
index 830141cf3bb6..c81204dae232 100644
--- a/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 3331f1755beb..dab787d003f5 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,4 +1,4 @@
 DIST tor-0.2.9.10.tar.gz 5557586 SHA256 d611283e1fb284b5f884f8c07e7d3151016851848304f56cfdf3be2a88bd1341 SHA512 c18c4faf18406f04165136f0d70e6bc2896f3f02770beadaab5e7a99441d71b897ae3a14a046eaec99a1bd6d8ad7758b28f7d652588842b77621cdc95d4fb7e1 WHIRLPOOL 8a12ab4bd148c6cf57e4e21ae29ccff46b9f687a1646f4453b0ba312b97b78d0c2a428f3178f47e58ec012eb2edce53efff4e07d7f0418d7ccc4ded3856a84a0
-DIST tor-0.3.0.6.tar.gz 5779422 SHA256 a3e512e93cb555601fd207d914d7c5fe981d66d6ebb5821ecdf5dea738c2fb14 SHA512 33983f8c0a32fc32e5586cb1da9a99c93b0502eecfb9db289723b275543ea01168cf1dd335e4c1c42ccf7991dd1d584286e764c1881f7d6ece928bbd109781cc WHIRLPOOL 12203d14683f3ac50c2aaa2d85da1758640ce1df8d2d0ebcd3d07411aec41eea3f443dc15c0e7a62dafabea6d1b206d06b39f97cf2b491430abd9adbe19dee77
-DIST tor-0.3.0.7.tar.gz 5793734 SHA256 9640c4448ef3cad7237c68ed6984e705db8fb2b9d6bb74c8815d01bb06527d02 SHA512 f6538e6d8dd444d2eb01f0cce48ec51a0e9ab533027d8941f1577f31136782685a4e317ff62bf21dfb52666df8d04f5dc996c5a0ceadccb2ba4fd91653989ccd WHIRLPOOL 34a6e7afb67b676e89d16cbd0805f1d1ed06df5097267e8f26d0a441df269303b9425066ca016b745c83902cc40ba2c964f8a216da76d0cb8560b2b12eb52ee4
-DIST tor-0.3.1.2-alpha.tar.gz 5940823 SHA256 08ae20017883c42a1fe5d3ab0c3ab87683f8c6cfa70e4471c2ba00f549f6bc4d SHA512 619fb63545762d32a293621b3c63bda1f391700152c9bd9d213bef780ade0e5acd6a67a8b4e9bb9dabedfcb9c13a51bab085c0bff610c34db7989551a07de50d WHIRLPOOL 8479d6ec78025a65fd402c6b0f6330ccc9d78b57ceee3a6441be85069dca4ff5f815e427606f35dfb58e5975479ad2c68cd1be8a13c3b2d8c07a850fa5cd5e76
+DIST tor-0.2.9.11.tar.gz 5584296 SHA256 c1959bebff9a546a54cbedb58c8289a42441991af417d2d16f7b336be8903221 SHA512 bb7ceb416c6cdcf127cb3c45226aa0ce787fba85b6fb59e9c222193c6f2522f2ef85ee0f5062554a4d301ac49d20b68fd82c7ce00406ceae0d00f6ac4107d074 WHIRLPOOL 944657830ed485dc321a0f94bccda30816ad42e1ec1527bdd1b3688437d7df4a0533d16c10c320ae37280d1e00f67591f50964f84b92db1070c47aa85fccb923
+DIST tor-0.3.0.8.tar.gz 5796845 SHA256 663a3ba7b8a124c0f8a7351eaa2dda6fd518de3f3c4ee28fff869bfb03860d48 SHA512 93267e51578266f6f6eea57e7fcd7ec5f8fbeb2e880675956724a0b1c1dfe1826945aaba4ca3075b577505d0ce70fd7def2f2a9e06af78f52190e15a7aad2ee1 WHIRLPOOL a301811a7cf7dbd444a16802dcece32dbd679895e6bf45ad7c51787171a4d80d51a438585e5a1f9e1da55405537b706fafc3a6565f72bf08e89608a4fde98b85
+DIST tor-0.3.1.3-alpha.tar.gz 5946205 SHA256 05b0fd6b1d119d038dc0a4e00261b821e1be0b96c83fbc6251cb25d5435ed9b4 SHA512 72ef78e04d9105e75d72b468ad928321485c34926fe4360224ebe507a5d788527aff76e1d34f6180452cc19f77741a5dbcc3a8676926a94dcebb445fce3d6aa3 WHIRLPOOL febf547e54562a191196462ad5e77dba2b73939337a5929f47d4579f958f8b6793a0114c0c7e96fcfb95e5e3ed48521d06fa410c83609eee877eb78dcbb2eb3a
diff --git a/net-vpn/tor/tor-0.3.0.6.ebuild b/net-vpn/tor/tor-0.2.9.11.ebuild
similarity index 72%
rename from net-vpn/tor/tor-0.3.0.6.ebuild
rename to net-vpn/tor/tor-0.2.9.11.ebuild
index b103e82a8aed..035d07ef861f 100644
--- a/net-vpn/tor/tor-0.3.0.6.ebuild
+++ b/net-vpn/tor/tor-0.2.9.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
+inherit eutils flag-o-matic readme.gentoo-r1 systemd versionator user
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -30,22 +30,26 @@ DEPEND="
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-tor )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-)
-
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
-
 pkg_setup() {
 	enewgroup tor
 	enewuser tor -1 -1 /var/lib/tor tor
 }
 
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+	eapply_user
+}
+
 src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+
 	econf \
-		--localstatedir="${EPREFIX}/var" \
 		--enable-system-torrc \
 		--enable-asciidoc \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable scrypt libscrypt) \
 		$(use_enable seccomp) \
 		$(use_enable systemd) \
@@ -57,15 +61,19 @@ src_configure() {
 }
 
 src_install() {
-	default
 	readme.gentoo_create_doc
 
 	newconfd "${FILESDIR}"/tor.confd tor
 	newinitd "${FILESDIR}"/tor.initd-r8 tor
-	systemd_dounit contrib/dist/tor.service
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	emake DESTDIR="${D}" install
 
 	keepdir /var/lib/tor
 
+	dodoc -r README ChangeLog ReleaseNotes doc/HACKING
+
 	fperms 750 /var/lib/tor
 	fowners tor:tor /var/lib/tor
 
diff --git a/net-vpn/tor/tor-0.3.0.7.ebuild b/net-vpn/tor/tor-0.3.0.8.ebuild
similarity index 96%
rename from net-vpn/tor/tor-0.3.0.7.ebuild
rename to net-vpn/tor/tor-0.3.0.8.ebuild
index b103e82a8aed..94074ecef87f 100644
--- a/net-vpn/tor/tor-0.3.0.7.ebuild
+++ b/net-vpn/tor/tor-0.3.0.8.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 IUSE="libressl scrypt seccomp selinux systemd tor-hardening test web"
 
 DEPEND="
diff --git a/net-vpn/tor/tor-0.3.1.2_alpha.ebuild b/net-vpn/tor/tor-0.3.1.3_alpha.ebuild
similarity index 100%
rename from net-vpn/tor/tor-0.3.1.2_alpha.ebuild
rename to net-vpn/tor/tor-0.3.1.3_alpha.ebuild
diff --git a/perl-core/File-Path/File-Path-2.130.0.ebuild b/perl-core/File-Path/File-Path-2.130.0.ebuild
index 81c1969a8d82..b8ed7ea9c511 100644
--- a/perl-core/File-Path/File-Path-2.130.0.ebuild
+++ b/perl-core/File-Path/File-Path-2.130.0.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="File path and name utilities"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index fcc374a0c275..b9daff32906f 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (10 Jun 2017)
+# media-libs/libilbc has not been ported to ia64, bug #610546
+media-video/ffmpeg libilbc
+
 # Sergei Trofimovich <slyfox@gentoo.org> (06 Jun 2017)
 # Mask USE=rados for net-analyzer/rrdtool since sys-cluster/ceph is not
 # keyworded (bug #549516)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b26deab788e6..49ead2b5a9b6 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5440,6 +5440,7 @@ net-dns/pdns-recursor:protobuf - Enable support for dev-libs/protobuf.
 net-dns/pdnsd:isdn - Linux-only: check status of ippp interfaces with ISDN-specific system calls.
 net-dns/pdnsd:urandom - Linux-only: use /dev/urandom (pseudo-random number generation) instead of the default use of random() PRNG.
 net-dns/resolvconf-symlink:symlink - Actually replace /etc/resolv.conf with a symlink. Without this flag, the ebuild is a no-op.
+net-dns/unbound:dnscrypt - Enable DNSCrypt support
 net-dns/unbound:dnstap - Enable dnstap support
 net-dns/unbound:ecdsa - Enable ECDSA support
 net-dns/unbound:gost - Enable GOST support
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
index f63d5e79bcab..07204797db36 100644
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
@@ -14,8 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc gtk"
 
-RDEPEND="dev-libs/libxml2:2
-	media-gfx/exiv2
+RDEPEND="
+	dev-libs/libxml2:2
+	media-gfx/exiv2:=
 	gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 46912af538f0..fff040682798 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1 +1,2 @@
 DIST baselayout-2.3.tar.bz2 32266 SHA256 e7bbd7d71ede6820a37738fd2e9010d54545fbd73c16ee686663dee2075c5d4c SHA512 cf9636c7d5c1fb4abf63dd931dc8ceaa30cf871f5e576a53dcc207abd54b8eec7778a1ef29766e2e8f5c0a098b9b3d07361717ae190027d1e102aceb4a07cacb WHIRLPOOL 92e88f5ff0eddd56698977bb6578ee53f62755bfdd9023fc7151415fce4a87952b539e0da3a7056a0f90c668a5a1c4fe2b43af0359fe9c40b4dc7b50568711d7
+DIST baselayout-2.4.1.tar.bz2 31307 SHA256 d75ae329ba47f26e7c41c6e060f57a8f1f1a97420d39e6a49ab2bdb86c4a2c00 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1 WHIRLPOOL 9057ab259c8ef61bb56d13b237e343f6a7aec8fef61a0a9872fc7e0aa34a7dc772cd4701a76341d170eaa3ba328ad0b693d098189ca7f4aa9e5e32232f1d1801
diff --git a/sys-apps/baselayout/baselayout-2.4.1.ebuild b/sys-apps/baselayout/baselayout-2.4.1.ebuild
new file mode 100644
index 000000000000..0c2d7de0cd4e
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.4.1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib versionator
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build kernel_linux"
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	[ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		exp=( {,usr/,usr/local/}${libdir} )
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	local prefix
+	for prefix in "${EROOT}"{,usr/,usr/local/} ; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [ -d "${prefix}lib32" ] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+}
+
+pkg_preinst() {
+	# Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of
+	# the baselayout-1.x ebuild copies all the real configs from the user's
+	# /etc/conf.d into ${D}, it makes them all appear to be the default
+	# versions. In order to protect them from being unmerged after this
+	# upgrade, modify their timestamps.
+	touch "${EROOT}"/etc/conf.d/* 2>/dev/null
+
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout || die
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		sed -i -r\
+			-e "/PATH=/!s:/(etc|usr/bin|bin):\"${EPREFIX}\"/\1:g" \
+			-e "/PATH=/s|([:\"])/|\1${EPREFIX}/|g" \
+			-e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \
+			-e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \
+			etc/profile || die
+		sed -i -r \
+			-e "s:/(etc/env.d|opt|usr):${EPREFIX}/\1:g" \
+			-e "/^PATH=/s|\"$|:${EPREFIX}/usr/sbin:${EPREFIX}/sbin\"|" \
+			etc/env.d/50baselayout || die
+		sed -i "s:/bin:${EPREFIX}/bin:" etc/shells || die
+		sed -i -r \
+			-e "s,:/(root|bin|sbin|var|),:${EPREFIX}/\1,g" \
+			share.Linux/passwd || die
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
+}
+
+src_install() {
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${ED}" \
+		install
+	dodoc ChangeLog
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}etc/${x}" ] && continue
+		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}"
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# baselayout leaves behind a lot of .keep files, so let's clean them up
+	find "${EROOT}"lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null
+	find "${EROOT}"lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"run
+
+		if ! grep -qs "^tmpfs.*/run " "${ROOT}"proc/mounts ; then
+			echo
+			ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+		fi
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ! xersion_is_at_least 2.4 ${v}; then
+			ewarn "After updating ${EROOT}etc/profile, please run"
+			ewarn "env-update and . /etc/profile"
+			break
+		fi
+	done
+
+	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
+		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/dbus/dbus-1.10.18.ebuild b/sys-apps/dbus/dbus-1.10.18.ebuild
index 22378074fabc..3bd2f2d691d0 100644
--- a/sys-apps/dbus/dbus-1.10.18.ebuild
+++ b/sys-apps/dbus/dbus-1.10.18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test user-session X"
 
 RESTRICT="test"
diff --git a/sys-apps/dmidecode/dmidecode-3.0.ebuild b/sys-apps/dmidecode/dmidecode-3.0.ebuild
index 9427da0a94f1..a21456f2e204 100644
--- a/sys-apps/dmidecode/dmidecode-3.0.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="-* amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/ethtool/ethtool-4.8.ebuild b/sys-apps/ethtool/ethtool-4.8.ebuild
index b904b76ebe81..8895d365961f 100644
--- a/sys-apps/ethtool/ethtool-4.8.ebuild
+++ b/sys-apps/ethtool/ethtool-4.8.ebuild
@@ -9,6 +9,6 @@ SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/file/file-5.30.ebuild b/sys-apps/file/file-5.30.ebuild
index 0be77ba8b90d..9eb32ff3d04f 100644
--- a/sys-apps/file/file-5.30.ebuild
+++ b/sys-apps/file/file-5.30.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz
 		ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~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"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/hdparm/hdparm-9.51.ebuild b/sys-apps/hdparm/hdparm-9.51.ebuild
index 41e9d34a437c..23e26825b22c 100644
--- a/sys-apps/hdparm/hdparm-9.51.ebuild
+++ b/sys-apps/hdparm/hdparm-9.51.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/hwids/hwids-20170328.ebuild b/sys-apps/hwids/hwids-20170328.ebuild
index 481ea741194e..3b53663fe67e 100644
--- a/sys-apps/hwids/hwids-20170328.ebuild
+++ b/sys-apps/hwids/hwids-20170328.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/noexec/noexec-1.1.0-r1.ebuild b/sys-apps/noexec/noexec-1.1.0-r1.ebuild
index c5507a32d0ef..5e25d33d7981 100644
--- a/sys-apps/noexec/noexec-1.1.0-r1.ebuild
+++ b/sys-apps/noexec/noexec-1.1.0-r1.ebuild
@@ -9,13 +9,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="sys-libs/glibc"
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README )
-
-src_install() {
-	emake install DESTDIR="${D}"
-	einstalldocs
-}
diff --git a/sys-apps/systemd/systemd-233-r1.ebuild b/sys-apps/systemd/systemd-233-r1.ebuild
index 45477c8f22b5..c0a2a3751ca6 100644
--- a/sys-apps/systemd/systemd-233-r1.ebuild
+++ b/sys-apps/systemd/systemd-233-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		!doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
index 9af972132141..bf42506e600b 100644
--- a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
+++ b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://spice-space.org/download/${PN}/${PN}-${MY_PV}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index a3a1e72cc88b..2dafe5dae08c 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,4 +1,2 @@
 DIST keystone-10.0.1.tar.gz 1357929 SHA256 1030e6e818db6b9d84a2ad430912b821c9309ecf600fd0753bd75a741a9e4ddc SHA512 86069e19f519dcf51079a1c3a32658fabdaf5c59b4f5010dd6d3ddc28dbdf710a271d22af22d3451b5553eff609da6252577f8329a7f3a517da148bf37207c86 WHIRLPOOL f24a8bbd3efce90e26d00e484bd5b5cac738568a4fb4948b8f3fa6d51e34bf83488247168cdf75533e80b05a28c17bd3b5bf9f3298f40e86fa5f80255992c025
-DIST keystone-11.0.0.tar.gz 1399328 SHA256 296f18beb4494b243bf78a8f6e14d0f6e402d230620f870ee76955d5b135afe2 SHA512 3e054613973dc67e54e9eb248a42685eda3b7a98236955246b02ed2a0193bbab606d8cc8b4cd6f05b15de2cc68f3a1f12f43a4d5725591cfcef4de063b834598 WHIRLPOOL d8ce1c87e68a339ecbc132d93eb657d1ff5d2f9e669020621b1e53a06313b5b907623d752e980541726528ee90a243788088642cfef322802cdf01e647946a7e
-DIST keystone-11.0.1.tar.gz 1373584 SHA256 b1117e6074c94e0d87d4ddba46f5ee3f786ebc98322cd13c206887e773770248 SHA512 c911883c575436e1696deb5522cc7715d6feaa217e9afc8dad2cbf93840ad1e29eca9e8d101385b55d660867bcf3da4d74497cb6f28e337a5fc75fff64c5a394 WHIRLPOOL bd8221c8340f9f4ea8b8dfad3c5941bd49925a6786f83abf6b9f9f7486558e60be0327f2ac0b969565f5e126ba0ce4024ae732104a1a82864043fd94b2ef133f
 DIST keystone-11.0.2.tar.gz 1370396 SHA256 cf25068272dba6c6487477e3d620ae449770d73d3e3382d37d2b88cf80fe9ef1 SHA512 d2ec2c6e01df524f5dbec12960ffb54bb2a5400fff61027d6e632b1d775223e5e7ca97962db70acfbcd61e6c13ce9f5e392fc44249836055228ba4547e4ae4e6 WHIRLPOOL 7c9eff71b588632b125ca22824477116e387d4cfbf46b724510806b24a5d1d7694e3566da43ea8f0646a2c7059b8e6eb58343d6df4abec0427a4197f2a64354d
diff --git a/sys-auth/keystone/keystone-11.0.0-r1.ebuild b/sys-auth/keystone/keystone-11.0.0-r1.ebuild
deleted file mode 100644
index b440165cad0b..000000000000
--- a/sys-auth/keystone/keystone-11.0.0-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite ldap memcached mongo mysql postgres test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	memcached? (
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-	)
-	mongo? (
-		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
-	)
-	ldap? (
-		>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
-		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
-	)
-	|| (
-		www-servers/uwsgi[python,${PYTHON_USEDEP}]
-		www-apache/mod_wsgi[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/cve-2017-2673-stable-ocata.patch"
-)
-
-pkg_setup() {
-	enewgroup keystone
-	enewuser keystone -1 -1 /var/lib/keystone keystone
-}
-
-python_prepare_all() {
-	# it's in git, but not in the tarball.....
-	sed -i '/^hacking/d' test-requirements.txt || die
-	mkdir -p ${PN}/tests/tmp/ || die
-	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
-	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
-	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -I 'test_keystoneclient*' \
-		-e test_static_translated_string_is_Message \
-		-e test_get_token_id_error_handling \
-		-e test_provider_token_expiration_validation \
-		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	diropts -m 0750
-	keepdir /etc/keystone /var/log/keystone
-	insinto /etc/keystone
-	insopts -m0640 -okeystone -gkeystone
-	doins etc/keystone.conf.sample etc/logging.conf.sample
-	doins etc/default_catalog.templates etc/policy.json
-	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
-	insinto /etc/keystone/httpd
-	doins httpd/*
-
-	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
-}
-
-pkg_postinst() {
-	elog "You might want to run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "if this is a new install."
-	elog "If you have not already configured your openssl installation"
-	elog "please do it by modifying /etc/ssl/openssl.cnf"
-	elog "BEFORE issuing the configuration command."
-	elog "Otherwise default values will be used."
-}
-
-pkg_config() {
-	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
-		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
-		read
-		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
-	else
-		einfo "keystone PKI certificates directory already present, skipping configuration"
-	fi
-}
diff --git a/sys-auth/keystone/keystone-11.0.1.ebuild b/sys-auth/keystone/keystone-11.0.1.ebuild
deleted file mode 100644
index 1ec7ebf3a112..000000000000
--- a/sys-auth/keystone/keystone-11.0.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+sqlite ldap memcached mongo mysql postgres test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	memcached? (
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-	)
-	mongo? (
-		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
-	)
-	ldap? (
-		>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
-		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
-	)
-	|| (
-		www-servers/uwsgi[python,${PYTHON_USEDEP}]
-		www-apache/mod_wsgi[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup keystone
-	enewuser keystone -1 -1 /var/lib/keystone keystone
-}
-
-python_prepare_all() {
-	# it's in git, but not in the tarball.....
-	sed -i '/^hacking/d' test-requirements.txt || die
-	mkdir -p ${PN}/tests/tmp/ || die
-	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
-	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
-	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -I 'test_keystoneclient*' \
-		-e test_static_translated_string_is_Message \
-		-e test_get_token_id_error_handling \
-		-e test_provider_token_expiration_validation \
-		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	diropts -m 0750
-	keepdir /etc/keystone /var/log/keystone
-	insinto /etc/keystone
-	insopts -m0640 -okeystone -gkeystone
-	doins etc/keystone.conf.sample etc/logging.conf.sample
-	doins etc/default_catalog.templates etc/policy.json
-	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
-	insinto /etc/keystone/httpd
-	doins httpd/*
-
-	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
-}
-
-pkg_postinst() {
-	elog "You might want to run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "if this is a new install."
-	elog "If you have not already configured your openssl installation"
-	elog "please do it by modifying /etc/ssl/openssl.cnf"
-	elog "BEFORE issuing the configuration command."
-	elog "Otherwise default values will be used."
-}
-
-pkg_config() {
-	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
-		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
-		read
-		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
-	else
-		einfo "keystone PKI certificates directory already present, skipping configuration"
-	fi
-}
diff --git a/sys-auth/keystone/keystone-11.0.2.ebuild b/sys-auth/keystone/keystone-11.0.2.ebuild
index 5ffc0c9e0c8f..cea21c5a4be1 100644
--- a/sys-auth/keystone/keystone-11.0.2.ebuild
+++ b/sys-auth/keystone/keystone-11.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+sqlite ldap memcached mongo mysql postgres test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-auth/pam_p11/pam_p11-0.1.6.ebuild b/sys-auth/pam_p11/pam_p11-0.1.6.ebuild
index f1e8391af601..b3747044554b 100644
--- a/sys-auth/pam_p11/pam_p11-0.1.6.ebuild
+++ b/sys-auth/pam_p11/pam_p11-0.1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/pam
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index e84ad9bd7f49..75d48f6d5272 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1,11 +1,5 @@
 DIST newton-nova.conf.sample 44496 SHA256 a7d9b95e67b77d0335edac760e037ad117d8c9f18c4792939ba8bb02739eae58 SHA512 ac917f0fed24c6705cbe43b4e1af31138bb656ea06f0cbe66d5b820677a47ca854abf6ca7fdf76a9a7f3a5afff758dac294ffd778d1bda82bb9f95c48d103d6e WHIRLPOOL 3c54dc8e4721f4289a8f64e9ac215c4b2e4b6afd2904fea4080659d3c292dcd942535d998b463efa4dd96a6090afb9830dfa6b9b3f2062439a8d03ec09356adc
-DIST nova-14.0.5.tar.gz 5595066 SHA256 762f18a0e18bda9d2c962e906424b8a60e3c2692d9b597d728a5c9b3ae28926a SHA512 8e169c625f65b1333dbf0737fd3451903ebf0a95bfac37394f588182d5395e3dc7d037075ef572306e9a07530c42a2d560bc26cb23ecc28c320e7412b5b1b093 WHIRLPOOL d6147e64405c11640ab3c7e1605d9e17a56fc1e4831516049059e1b114eab44d0f2ef6ea29209646caf5a80c5f595e69577c1936fc99507efd7ac3a2629c9d83
-DIST nova-14.0.6.tar.gz 5597601 SHA256 e93d0ca8f12574f347580f33624c9a86860b2964ecc91ecdccb4f223dbb115d9 SHA512 8c84b1c8557c0258699bd031143eb4106ab926471438c268fb61dd3eacbfd552fd1f4b8ce95817f1501f22be1673d2b90a6646d457f991cdc406f48546854142 WHIRLPOOL f6ce5c263db359b819d551bc087004a21762c6cbff27587d8812cc7e8f4d1c38026e7d29784d4e3f5c9e745d7b7369afd6a8b3ebb151ef3a48f2ccc68ac7924b
 DIST nova-14.0.7.tar.gz 5601074 SHA256 765c5a69a85fe464c25be9f146f4869108a315fa77de46da81c724e855ba5eb9 SHA512 27b7683e6266e1a0e23023818bd008e14202b1e20c21dd74fd687437beb8c6b2b5689a2428e34202275caeae52ed6b29f713cf82e94ff28114825f16347a5b9b WHIRLPOOL e5aede657ac4270d4005d060177bd99c4fd3f382ac26467f5cf91b4e8b0443bb17dedaf154a34efc100db0b6019c9120908efea24446eca41135135a3445408f
-DIST nova-15.0.3.tar.gz 5743284 SHA256 01ff12909304dc8d41fef460cda73c6bd8a5612a3de1b86846962d6bcd71777d SHA512 d2c6d0f241503cb1fe7a00945cb2e896f9f4c32fe8d94a2a2bcd9a3ede994eb5aa5ea0e7183fe2067e886a315859d1166b30ad1edb8241c043a19208522f5761 WHIRLPOOL db277c56a28ca5de613364dcca81ebdf58e9573c0551203a3f29bc14fc2d05a6fbf0c87b4a35d2881ecd8f29361177f4bde378b53eb3a706cf0b921c3e11dd2f
-DIST nova-15.0.4.tar.gz 5740930 SHA256 a213a34cc7fee0ab5b323b385644de5e6069107acc776cfc679eefb071692eb3 SHA512 74ba9f6c2246c44612f016777c14e264d4df1432c8311a8eaa0bac17ba67d5302f5e2e9c42a009e8c214451d7c5bee54fcd9fcecf58ebaacd227cf5e98180c90 WHIRLPOOL 5522b7af0d815fced042e7ea856f219a3ba9d1808e40b97b8b2bbefa07deffdcec6a2b05a6439f4c264c6ef1f8cbfc80f47c205f068bbf9832b73805002816de
 DIST nova-15.0.5.tar.gz 5747766 SHA256 4b28ca36923ffdd9c8740f9743efd86585ce18809017c7276442650d2d450033 SHA512 19158f122b7fb8013d65e03d4b00f5afdf90abbc1b90fed4ff497d2ce7350302b34fffa7febd25da8a8bc6654d399dde049740452339c6a979a0aa8f9650a856 WHIRLPOOL d07dd7aefe5fda743a75817df33219cac6c876c2e968f2c026860216026e25e5a2ce2b65d66f6a8fc5a5dc6a1ed380e980bee410ac81e4cec98c069f9687c711
-DIST nova.conf.sample-15.0.3 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
-DIST nova.conf.sample-15.0.4 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
 DIST nova.conf.sample-15.0.5 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
 DIST nova.conf.sample-2017.1.9999 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
diff --git a/sys-cluster/nova/nova-14.0.5.ebuild b/sys-cluster/nova/nova-14.0.5.ebuild
deleted file mode 100644
index 50457191bde1..000000000000
--- a/sys-cluster/nova/nova-14.0.5.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/newton/nova.conf.sample -> newton-nova.conf.sample
-https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/wsgiintercept-0.6.1[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/newton-nova.conf.sample" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-14.0.6.ebuild b/sys-cluster/nova/nova-14.0.6.ebuild
deleted file mode 100644
index 02b892923242..000000000000
--- a/sys-cluster/nova/nova-14.0.6.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/newton/nova.conf.sample -> newton-nova.conf.sample
-https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/newton-nova.conf.sample" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-14.0.7.ebuild b/sys-cluster/nova/nova-14.0.7.ebuild
index 5939589ac925..2c2ce969d8c2 100644
--- a/sys-cluster/nova/nova-14.0.7.ebuild
+++ b/sys-cluster/nova/nova-14.0.7.ebuild
@@ -13,7 +13,7 @@ https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
 REQUIRED_USE="
 	!compute-only? ( || ( mysql postgres sqlite ) )
diff --git a/sys-cluster/nova/nova-15.0.3.ebuild b/sys-cluster/nova/nova-15.0.3.ebuild
deleted file mode 100644
index 0f545c75da67..000000000000
--- a/sys-cluster/nova/nova-15.0.3.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.1.1[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-15.0.4.ebuild b/sys-cluster/nova/nova-15.0.4.ebuild
deleted file mode 100644
index 9e80365101cf..000000000000
--- a/sys-cluster/nova/nova-15.0.4.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.1.1[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-15.0.5.ebuild b/sys-cluster/nova/nova-15.0.5.ebuild
index bf73fe84fdad..1b3ce7a7f9db 100644
--- a/sys-cluster/nova/nova-15.0.5.ebuild
+++ b/sys-cluster/nova/nova-15.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.c
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
 REQUIRED_USE="
 	!compute-only? ( || ( mysql postgres sqlite ) )
diff --git a/sys-devel/gdb/gdb-7.12.1.ebuild b/sys-devel/gdb/gdb-7.12.1.ebuild
index 665ca31e21f5..326bcb3587a9 100644
--- a/sys-devel/gdb/gdb-7.12.1.ebuild
+++ b/sys-devel/gdb/gdb-7.12.1.ebuild
@@ -57,7 +57,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
 	# alpha #562128
-	KEYWORDS="-alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="-alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server test vanilla xml"
 REQUIRED_USE="
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
index b5b7759fe12c..98f51b7a799e 100644
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 # so put that license behind USE=cxx.
 LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
 
 # only runtime goes multilib
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild
index 862057bcc48f..c3027e72aaee 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/$
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
index db7a79ae561b..e1def45bbe1a 100644
--- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
 	systemd? ( udev )
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.16.ebuild
index 7c0aa0623684..3f67d835942f 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.16.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.16.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild b/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild
index 9d9e14b254f2..3b23fb500322 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20170314.ebuild
@@ -8,11 +8,11 @@ if [[ ${PV} == 99999999* ]]; then
 	inherit git-2
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS="alpha amd64 arm ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 else
 	GIT_COMMIT="e39f0e3e6897ad865b3704f61218ae83f98a85da"
 	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.xz -> ${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-libs/ldb/ldb-1.1.29-r1.ebuild b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
index f22033ed99db..88ada9ee710a 100644
--- a/sys-libs/ldb/ldb-1.1.29-r1.ebuild
+++ b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc +ldap +python"
 
 RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
diff --git a/sys-libs/libsmbios/libsmbios-2.3.2.ebuild b/sys-libs/libsmbios/libsmbios-2.3.2.ebuild
index 1d257c3a29f4..d2777066e17c 100644
--- a/sys-libs/libsmbios/libsmbios-2.3.2.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 OSL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
+KEYWORDS="amd64 ia64 x86"
 IUSE="doc graphviz nls python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/talloc/talloc-2.1.9.ebuild b/sys-libs/talloc/talloc-2.1.9.ebuild
index 67401dbb931f..0906c7aca1f8 100644
--- a/sys-libs/talloc/talloc-2.1.9.ebuild
+++ b/sys-libs/talloc/talloc-2.1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.3.13.ebuild b/sys-libs/tdb/tdb-1.3.13.ebuild
index 8852f60c8929..6cc946568168 100644
--- a/sys-libs/tdb/tdb-1.3.13.ebuild
+++ b/sys-libs/tdb/tdb-1.3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tevent/tevent-0.9.31-r1.ebuild b/sys-libs/tevent/tevent-0.9.31-r1.ebuild
index 767c716aafbb..ead329f9200b 100644
--- a/sys-libs/tevent/tevent-0.9.31-r1.ebuild
+++ b/sys-libs/tevent/tevent-0.9.31-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="python"
 
 RDEPEND=">=sys-libs/talloc-2.1.8[${MULTILIB_USEDEP}]
diff --git a/virtual/emacs/emacs-25.ebuild b/virtual/emacs/emacs-25.ebuild
index 7c37f55f9739..f489729517f3 100644
--- a/virtual/emacs/emacs-25.ebuild
+++ b/virtual/emacs/emacs-25.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for GNU Emacs"
 SLOT="0"
-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"
+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"
 
 RDEPEND="|| ( app-editors/emacs:25
 		>=app-editors/emacs-vcs-25.1 )"
diff --git a/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild b/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild
index 7bb7db7e4bc6..db69b1a4a4fa 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/pypy/pypy-5.8.0.ebuild b/virtual/pypy/pypy-5.8.0.ebuild
new file mode 100644
index 000000000000..fd13aeec7bb6
--- /dev/null
+++ b/virtual/pypy/pypy-5.8.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A virtual for PyPy Python implementation"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
+		>=dev-python/pypy-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
+	)"
diff --git a/virtual/pypy3/pypy3-5.7.1.ebuild b/virtual/pypy3/pypy3-5.7.1.ebuild
index 727f7d6c1120..fd00797851f9 100644
--- a/virtual/pypy3/pypy3-5.7.1.ebuild
+++ b/virtual/pypy3/pypy3-5.7.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 DESCRIPTION="A virtual for PyPy3 Python implementation"
 # XX from pypy3-XX.so module suffix
 SLOT="0/57"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~amd64-linux"
 IUSE="bzip2 gdbm ncurses sqlite tk"
 
 RDEPEND="
diff --git a/virtual/pypy3/pypy3-5.8.0-r1.ebuild b/virtual/pypy3/pypy3-5.8.0-r1.ebuild
new file mode 100644
index 000000000000..c847a5995bda
--- /dev/null
+++ b/virtual/pypy3/pypy3-5.8.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A virtual for PyPy3 Python implementation"
+# XX from pypy3-XX.so module suffix
+SLOT="0/58"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="bzip2 gdbm ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
+		>=dev-python/pypy3-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
+	)"
diff --git a/virtual/python-dnspython/python-dnspython-2.ebuild b/virtual/python-dnspython/python-dnspython-2.ebuild
index ec2844006fb1..e2f009dc0dda 100644
--- a/virtual/python-dnspython/python-dnspython-2.ebuild
+++ b/virtual/python-dnspython/python-dnspython-2.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
 
 DESCRIPTION="A virtual for dnspython, for Python 2 & 3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index e095516ec0a4..d0f9939b2c0a 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1 +1,2 @@
 DIST wordpress-4.7.5.tar.gz 8037036 SHA256 95af89101db8efea48711b7cc169c2a7440a2fba17eee1a057f442091cdec01b SHA512 7d6e4feaf95c49ec7e68068687a399145613d90b5867616ac7a324c60f9107f2453c9f745a455b94e84ef12b191cb2ac67e6b4dd3b8f669e344ea63afc6988ca WHIRLPOOL 6d07fc57d2bf89d73d2a4b72c2811c4bba1d30fa9a06f3abc65792e12f42899cca573874942eef7433445ca38614bced1f839fba5e67a312e55d764223347ce2
+DIST wordpress-4.8.tar.gz 8169865 SHA256 39210d593700dc26c58a53b38172be63ea3da67020d80bb2cf34b396b732dd4d SHA512 20249cf13dbcec198df3ec1feb3a7381c194c7c9f832262e40449f90c5e5b5d3f4b63b6021e78c65cc615e059b1b601881d33ce03e1e4618231329b680511467 WHIRLPOOL 3b92caddcdd48213a887f68afd73cd3c1973e9232e30cc8429886809802d5786f12e3732540a06e91358ab97716df2dab735a2341799d6949929cc1843f29ee9
diff --git a/www-apps/wordpress/wordpress-4.8.ebuild b/www-apps/wordpress/wordpress-4.8.ebuild
new file mode 100644
index 000000000000..c7283f88735a
--- /dev/null
+++ b/www-apps/wordpress/wordpress-4.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+S=${WORKDIR}/${PN}
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc readme.html
+	rm readme.html license.txt || die
+
+	if ! use akismet ; then
+		rm -R wp-content/plugins/akismet/ || die
+	fi
+	if ! use examples ; then
+		rm wp-content/plugins/hello.php || die
+	fi
+	if ! use themes ; then
+		rm -R wp-content/themes/*/ || die
+	fi
+
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
diff --git a/www-servers/lighttpd/lighttpd-1.4.45.ebuild b/www-servers/lighttpd/lighttpd-1.4.45.ebuild
index f1d93daf5c2e..76650cfba5d8 100644
--- a/www-servers/lighttpd/lighttpd-1.4.45.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.45.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.0.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.0.ebuild
index 5bf712dc0c95..2a1927335334 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.0.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-base/xorg-server/xorg-server-1.19.3.ebuild b/x11-base/xorg-server/xorg-server-1.19.3.ebuild
index 3c4eaed216e2..1cb741e203e6 100644
--- a/x11-base/xorg-server/xorg-server-1.19.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.3.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind"
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.25.1.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.25.1.ebuild
index 934304f7b694..bdd50af1b9f0 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.25.1.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.25.1.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-2
 
 DESCRIPTION="X.org input driver based on libinput"
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libinput-1.5.0:0="
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.9.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.9.0.ebuild
index 402ac0dff772..4c9abd31b64b 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.9.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-7.9.0.ebuild
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
 DESCRIPTION="ATI video driver"
 HOMEPAGE="http://www.x.org/wiki/ati/"
 
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE="+glamor udev"
 
 RDEPEND=">=x11-libs/libdrm-2.4.58[video_cards_radeon]
diff --git a/x11-libs/libdrm/libdrm-2.4.80.ebuild b/x11-libs/libdrm/libdrm-2.4.80.ebuild
index 127c755e8bd2..61e448bb01be 100644
--- a/x11-libs/libdrm/libdrm-2.4.80.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.80.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://dri.freedesktop.org/${PN}/${P}.tar.bz2"
 fi
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
index c4ca26813970..f676058e95d0 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
@@ -17,7 +17,7 @@ inherit xorg-2 ${GIT_ECLASS}
 
 DESCRIPTION="X.Org xkbcommon library"
 HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86"
 IUSE="X doc test"
 
 DEPEND="sys-devel/bison
diff --git a/x11-libs/motif/motif-2.3.6-r1.ebuild b/x11-libs/motif/motif-2.3.6-r1.ebuild
index 822380726416..8f817e23974e 100644
--- a/x11-libs/motif/motif-2.3.6-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/motif/motif-2.3.6.ebuild b/x11-libs/motif/motif-2.3.6.ebuild
deleted file mode 100644
index 33b141df0579..000000000000
--- a/x11-libs/motif/motif-2.3.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="The Motif user interface component toolkit"
-HOMEPAGE="https://sourceforge.net/projects/motif/
-	http://motif.ics.com/"
-SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
-	http://dev.gentoo.org/~ulm/distfiles/${PN}-2.3.5-patches-1.tar.xz"
-
-LICENSE="LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	xft? (
-		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
-	x11-misc/xbitmaps"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	# disable compilation of demo binaries
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
-
-	# add X.Org vendor string to aliases for virtual bindings
-	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
-
-	# remove header file which shouldn't be in the tarball #578168
-	rm lib/Xm/Xm.h || die
-
-	AT_M4DIR=. eautoreconf
-
-	# get around some LANG problems in make (#15119)
-	LANG=C
-
-	# bug #80421
-	filter-flags -ftracer
-
-	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
-
-	# for Solaris Xos_r.h :(
-	[[ ${CHOST} == *-solaris2.11 ]] \
-		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
-
-	if use !elibc_glibc && use !elibc_uclibc && use unicode; then
-		# libiconv detection in configure script doesn't always work
-		# http://bugs.motifzone.net/show_bug.cgi?id=1423
-		export LIBS="${LIBS} -liconv"
-	fi
-
-	# "bison -y" causes runtime crashes #355795
-	export YACC=byacc
-
-	# remember the name of the C compiler for the native ABI
-	MY_NATIVE_CC=$(tc-getCC)
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-x \
-		$(use_enable static-libs static) \
-		$(use_enable motif22-compatibility) \
-		$(use_enable unicode utf8) \
-		$(use_enable xft) \
-		$(use_enable jpeg) \
-		$(use_enable png)
-}
-
-multilib_src_compile() {
-	# The wmluiltok build tool is linked with libfl.a, so always
-	# compile it for the native ABI
-	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
-	emake
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use examples; then
-		emake -C demos DESTDIR="${D}" install-data
-		dodir /usr/share/doc/${PF}/demos
-		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
-	fi
-}
-
-multilib_src_install_all() {
-	# mwm default configs
-	insinto /usr/share/X11/app-defaults
-	newins "${FILESDIR}"/Mwm.defaults Mwm
-
-	# cleanup
-	rm -rf "${ED}"/usr/share/Xm
-	prune_libtool_files
-
-	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
-}
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
index 59c1cb32604d..cf35d41d28c2 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Simple-2
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
index 880156be3653..d9d5530b4c5d 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
index e39dd90a29b4..40deb42b5728 100644
--- a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gkrellsun.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
 IUSE="nls"
 
 COMMON_DEPEND="app-admin/gkrellm[X]
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 5270810d74b6..ea85cb9fd310 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,2 +1,3 @@
 DIST qtcurve-1.8.18-dont_use_c++11.patch 1096 SHA256 09a9c42bd045dc9161881fdfe62b854d8577fc57e00a245ae03fb00a384cb82f SHA512 3228e4e5babd6a309fca02c4a103500acd913f40364e9dffd8238aa05377f4d31c3b2ba2c84427804de909712a2dd9b391e9f84206fca5146dbadc0d96183cf7 WHIRLPOOL 23f4e2d568e6a2331e2f34f8c3061c1f4171ef0b39e74a56da44c7d761626eefc2a5ff0fa39d4983d8c99742f753ec26dcc2287320aa8d43d5cab9a0d13f2245
 DIST qtcurve-1.8.18.tar.gz 991195 SHA256 85997c9fa4a948945d719342f5993486aecf189d176408280bad9af8600873a6 SHA512 0ba7927db11d1f2d7bad08fa923d3f0f2167d89fdf0d09bf0b677ffd4f2cc547c22890c87b8f18495e73f8ce21ffbd40899792a512dd9e2a481b81a52abd84eb WHIRLPOOL d3c7dc0c08b42deafdd5fcd513dcb2d9ea9c52ade8090d6cc022315ac80b1ea196a8a763d9c96096ee645f45bc329b837f23987bf7229c718d2a5811a35c68d1
+DIST qtcurve-1.8.18_p20170601.tar.xz 450280 SHA256 aa06d2ac8d4b5b01d227db30555db81f0b6e31ad8fd46cc31abcb3e03589742a SHA512 bde72d2f03403bcdc420612fc83b5dd20c51a4e0cd99a32dfbbd5de4bd2da666a990298ce760642a6d857d74df5e5bef0c737bf49c329ed21ae7e6f2b9ab7080 WHIRLPOOL 2adf543a03b8e88718cd7382ea52be683a7940c6b5593303d8c006d6bc1a1d828b70ad1d24d04379297918fee649a4bed03320a7bceb07077476ed640d2b3f95
diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18_p20170601-include.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18_p20170601-include.patch
new file mode 100644
index 000000000000..8b66c693c760
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.8.18_p20170601-include.patch
@@ -0,0 +1,10 @@
+--- a/qt5/style/qtcurve.cpp
++++ b/qt5/style/qtcurve.cpp
+@@ -67,6 +67,7 @@
+ #include <QSettings>
+ #include <QPixmapCache>
+ #include <QTextStream>
++#include <QDebug>
+ 
+ #include "shadowhelper.h"
+ #include <qtcurve-utils/x11qtc.h>
diff --git a/x11-themes/qtcurve/qtcurve-1.8.18_p20170601.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18_p20170601.ebuild
new file mode 100644
index 000000000000..5beaa57b806e
--- /dev/null
+++ b/x11-themes/qtcurve/qtcurve-1.8.18_p20170601.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A set of widget styles for Qt and GTK2"
+HOMEPAGE="https://github.com/QtCurve/qtcurve"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/QtCurve/qtcurve.git"
+else
+	SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+X gtk nls +qt4 qt5"
+REQUIRED_USE="gtk? ( X )
+	|| ( gtk qt4 qt5 )"
+
+RDEPEND="X? (
+		x11-libs/libxcb
+		x11-libs/libX11
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? ( dev-qt/qtdbus:5
+			dev-qt/qtx11extras:5 )
+	)
+	!x11-themes/gtk-engines-qtcurve"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
+
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DQTC_ENABLE_X11=$(usex X)
+		-DQTC_INSTALL_PO=$(usex nls)
+		-DQTC_QT4_ENABLE_KDE=OFF
+		-DQTC_QT4_ENABLE_KWIN=OFF
+		-DQTC_QT5_ENABLE_KDE=OFF
+		-DENABLE_GTK2=$(usex gtk)
+		-DENABLE_QT4=$(usex qt4)
+		-DENABLE_QT5=$(usex qt5)
+	)
+	cmake-utils_src_configure
+}