diff --git a/Manifest.files.gz b/Manifest.files.gz
index c734d54edf1d..b910bbf8b180 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d5b9bf60feec..c473f9d79a78 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/conky/conky-1.10.8.ebuild b/app-admin/conky/conky-1.10.8.ebuild
index 2679d6611621..e46eaaa3096c 100644
--- a/app-admin/conky/conky-1.10.8.ebuild
+++ b/app-admin/conky/conky-1.10.8.ebuild
@@ -73,6 +73,8 @@ CONFIG_CHECK=~IPV6
 
 DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
 
+PATCHES=( "${FILESDIR}"/${P}-use-pkgconfig.patch )
+
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
 To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
diff --git a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
new file mode 100644
index 000000000000..97e6bd02323f
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
@@ -0,0 +1,34 @@
+Reversed patch
+
+From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@diddyinc.com>
+Date: Tue, 23 Jan 2018 12:56:06 -0500
+Subject: [PATCH] Use FindCurses instead of pkg_check_modules.
+
+This should resolve #217.
+---
+ cmake/ConkyPlatformChecks.cmake | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
+index c5b39b2f..19ec7b9b 100644
+--- a/cmake/ConkyPlatformChecks.cmake
++++ b/cmake/ConkyPlatformChecks.cmake
+@@ -129,12 +129,12 @@ if(BUILD_HTTP)
+ endif(BUILD_HTTP)
+ 
+ if(BUILD_NCURSES)
++	pkg_check_modules(NCURSES ncurses)
++	if(NOT NCURSES_FOUND)
+-	include(FindCurses)
+-	if(NOT CURSES_FOUND)
+ 		message(FATAL_ERROR "Unable to find ncurses library")
++	endif(NOT NCURSES_FOUND)
++	set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
++	set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
+-	endif(NOT CURSES_FOUND)
+-	set(conky_libs ${conky_libs} ${CURSES_LIBRARIES})
+-	set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR})
+ endif(BUILD_NCURSES)
+ 
+ if(BUILD_MYSQL)
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index e274f427b0fe..d00c51f8205e 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,3 +1,2 @@
-DIST glance-15.0.0.tar.gz 1803491 BLAKE2B 70e0f1f7eab6aa0066d16e30e9325ac45d9c0eb9df875e3b26e90463e10299d6c7c272c0b070137f27332bdfcb33abeda68e3375e2562c83942ca72fcb24de38 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5
 DIST glance-15.0.1.tar.gz 1815463 BLAKE2B ec6e51340fc4d737e2bd777baf03163a0b515d19c1dc8e5203918e07b304a9539f47ba763207e26def985c6a384d21250ffe1386b433d8b606b55d3d70e4431a SHA512 2da3ada256424a7817d0c49aac0940443cbefcfff3df77a623d7099badf356808b5df59f109ac233f84ac561b7310d3b8d53cafd6c9955a8e2b296a1655cedd3
 DIST glance-16.0.0.tar.gz 1956293 BLAKE2B 457f18412885287d8a3ea1b702af0e7b826eeeaf93ce8b1b7456a42d3a84594cfe270670ac35e9c63d8fbb464a3ed0db823a6949fbfa37f993b260681222d9c1 SHA512 20ff8ba74eee3a5b69f7e357f69870398e96341831bea56bbad61314d3eff9d6767dfd48634d04f96cfbc4cc96c7eff3ab900748461ecaa14e2cf329aec40481
diff --git a/app-admin/glance/glance-15.0.0.ebuild b/app-admin/glance/glance-15.0.0.ebuild
deleted file mode 100644
index 601d8f56ec29..000000000000
--- a/app-admin/glance/glance-15.0.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 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 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	${CDEPEND}
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[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.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
-	dev-python/paste[${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-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	enewgroup glance
-	enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}/glance.initd" glance-api
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
-
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/glance/glance-15.0.1.ebuild b/app-admin/glance/glance-15.0.1.ebuild
index 408b991b18c1..affe9f8be82a 100644
--- a/app-admin/glance/glance-15.0.1.ebuild
+++ b/app-admin/glance/glance-15.0.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/pike"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index d115ba5e88c0..9ce0b69c47dc 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,4 @@
-DIST logstash-5.6.5.zip 109135563 BLAKE2B 6846231439807dd4fc77ae86af849aaefcc9084482f2f88de6148da3d31ef583164da6749ebe0c4def83217e95729a933acbb3e04777db58639eaab91de06831 SHA512 f1dcbb8f67d2f2868e38646b56376428e0996cbf302837300939b8c7ff6d764417fccea40f90559c48441f939e6940e84501ee3ad1e29ad2538969f2cc12b2b8
+DIST logstash-5.6.8.zip 109269226 BLAKE2B 7537b1a9687cc1f45f2573ed0ac9d4065bfc7e6d94e5a9d861a4227ace47346f1320e2fe9139a6bb82b8a75d5b4766e9a1e844dcc43c6b89990f1c1eb88f1262 SHA512 31dfc2792d54813d1361f117bcd4a489a5e37e1a3ad1c6f811fc0e15b4bbfeb84f5d842dea2b8fcb08e503a51ad58ccc298da9bf86536abcfb5541e71b999806
 DIST logstash-6.0.1.zip 116215793 BLAKE2B 676810b9cd62f578e31e1d63d4aae8c920590905a7344434d5e14607bab0e3ce59e2740e6839491f44ce769b24330a7a060174dcb5e6cb9cf51a31d165ba990b SHA512 395e4e2ff199d9ffc5156901d6ba6ab17771ab8f8859acede74567b2294e2d7ee2a6693e79f7b3e82c8d5c1959ad259bfb22e7992670cdcd3b73c7b72a635a31
 DIST logstash-6.1.1.zip 116335093 BLAKE2B e7a990c2ea0eb3ec7de714f038765817c76eaf9e6cef0e55106f1f1aca406ec95d6be779f24c1fa28e096b51feeef968cb31f416f99c85c2f45d798bb74aadf7 SHA512 a2a420169dff31f3d5d65628a9d1eaad930a8e544fc4e986e3671ffeea3a1d03c8f77f8b51568a0da082588a843568fb7aefe29c1c90365882f429f9536f9240
+DIST logstash-6.2.2.zip 146093122 BLAKE2B 0bd01673bb030593a944ecdd859ff0f44d8732f3ffef2b45b38798124c9caa547f625ae9c85300500683bac149b6ca4b9976bd0769fa0684989d40aa452a3584 SHA512 eb67b1fbe2530e4b24252a03aca572a41188e119cbf4a88267795782b347155f2e20405add6626585688fa6ed9d38fa463a0818fccd12612285950904dbd0cad
diff --git a/app-admin/logstash-bin/logstash-bin-5.6.5.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.8.ebuild
similarity index 98%
rename from app-admin/logstash-bin/logstash-bin-5.6.5.ebuild
rename to app-admin/logstash-bin/logstash-bin-5.6.8.ebuild
index f5c2a9c0a255..b14f892c2844 100644
--- a/app-admin/logstash-bin/logstash-bin-5.6.5.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/logstash-bin/logstash-bin-6.2.2.ebuild b/app-admin/logstash-bin/logstash-bin-6.2.2.ebuild
new file mode 100644
index 000000000000..1977b1915acb
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.2.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/lib/${MY_PN}"
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/startup.options || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "The default pidfile directory has been changed from /run/logstash to /run."
+	ewarn "Please ensure any running logstash processes are shut down cleanly."
+	ewarn
+	ewarn "The default data directory has been moved from /opt/logstash/data to"
+	ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
+	ewarn
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	einfo
+	einfo "Installing plugins:"
+	einfo "eselect logstash-plugin install logstash-output-gelf"
+	einfo
+
+	einfo "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	einfo
+	einfo "Sample configuration:"
+	einfo "${EROOT%/}/usr/share/${MY_PN}"
+}
diff --git a/app-admin/puppet/puppet-5.4.0-r1.ebuild b/app-admin/puppet/puppet-5.4.0-r1.ebuild
index c274ee7b9505..579eb5de4052 100644
--- a/app-admin/puppet/puppet-5.4.0-r1.ebuild
+++ b/app-admin/puppet/puppet-5.4.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
index e4aaf2332fd2..5fc804a5f545 100644
--- a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
+++ b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
 
 DEPEND="
 	sys-devel/flex
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c0a9e62b4b21..1fe4b7c424b9 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/dpkg/dpkg-1.19.0.5.ebuild b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
index 8bb605e25c5b..653592189fd4 100644
--- a/app-arch/dpkg/dpkg-1.19.0.5.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
 
 RDEPEND="
diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild b/app-arch/p7zip/p7zip-16.02-r2.ebuild
index fdc25149f249..60127ab58450 100644
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index d20cb4dcb10b..5bb21c688900 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,3 +1,6 @@
 DIST rarlinux-5.5.0_p20170811.tar.gz 546839 BLAKE2B d90bda3092fb636fee1db4f222632cf3d45c99f330298521b2a0957cd7bd4845f4518cf394e03a4e302d45cf73a37f5da5ac0cd7eba08a4859fd221697656c20 SHA512 c437d0be55ea90ae1dd9d657517d17d9edbba07cd77325785d8d503883847edeece2cc3993d3beec3a5b36b6830383b7026fbfc53b18f490288395994bc532cb
+DIST rarlinux-5.6.0_beta1_p20180311.tar.gz 551336 BLAKE2B d56bc53f729641cbf5cbc7b4abf9b3260e164e7cbf37e1faa227736456fff00d418699d05d628c5dfa0bf8517aa2c181a231e520e7c66c37288707808526d3d2 SHA512 9061ad96f8c933f942eb9e7d383a38b7056895ff542fdc26980f4d1140180f7a5c21ed288d4068edd0b25898645ff7977aad4b646882f5f8f57bbb8b89a40bd2
 DIST rarlinux-x64-5.5.0_p20170811.tar.gz 536028 BLAKE2B be453cab6720abc4b01f5aef6c5874b0ff328656f8452b2a671b1b5305427dbb0de2af4084e25e972c69fe4ca4072b10f21d66f7fee23a3e205b0b4f533c8b7f SHA512 1ca8cf7fbe526b43bdc9aeeccb6a0d86efd3bbaeee554e807d58ab62857294abc89662bb42b17b2cfe7e6739876c6345455cd027abbc4cb84312c58314278a66
+DIST rarlinux-x64-5.6.0_beta1_p20180311.tar.gz 540817 BLAKE2B 4ea8121df7dc57880cb148a8bf81c69b596011d3bfe462c90aaf9da4ce26d3fac1eb16324c55aaf79380f604493b9ecba1a1ed5ada76f76df1d9a1b97d522af3 SHA512 ca6624bdf55fe732a3aac18733b3ea35a519567474a49f549c27272a0107b60fa93ee16e0e49d5822d4fa33b11c355f67b047c42ed0393ef3a9d840eb8b4c783
 DIST winrar-x64-5.5.0_p20170811.exe 2220872 BLAKE2B a37783f427440a5166021475f024ca6e281b4f0d39926e55c00588e51d371bdd1bd16bd04ed65c363f7aeef6d7e2b0ba796325f7f290e45cfd8c09048ae25489 SHA512 f2aa40bb875be7f88cd618b1f5e02cfe0c5fb584f4e27d06531aaee018e613a70be7b7d3e8b92448381dc83605db6bf044cbecc52f63b6045193fef07601be66
+DIST winrar-x64-5.6.0_beta1_p20180311.exe 3186432 BLAKE2B 13063c52488f3a1e1d6a9f0b85761194d14feb549aede1c8653351cce8527794c88a37b177988328ac2293cf993848e1b0b4865a6f0adeef7c49a33a71f2f366 SHA512 2af5dabd88a0a70bdc2ffdbb1488e6b0b1c4cbe52d91bef86991c40b31fd8ef7482f47c134a13197798366eceee7ae6f8d39e0ef3660245ee89265cb65d43ffe
diff --git a/app-arch/rar/rar-5.6.0_beta1_p20180311.ebuild b/app-arch/rar/rar-5.6.0_beta1_p20180311.ebuild
new file mode 100644
index 000000000000..182140ef84a4
--- /dev/null
+++ b/app-arch/rar/rar-5.6.0_beta1_p20180311.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="http://www.rarsoft.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar || die
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar || die
+	dosym ../rar/unrar /opt/bin/unrar || die
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
+	else
+		doins default.sfx || die
+	fi
+	doins rarfiles.lst || die
+	dodoc *.txt
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index c72a0d2b8f26..8a2c2e9cca38 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1 +1,2 @@
 DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
+DIST unrar-5.6.1.tar.gz 225408 BLAKE2B 1b4cef7b55dec0658d4eca09e9dc933ed1ad10d87dabe3626a01974bddb51dabf89c39f2db200cbe4388a682c0a756c720d116b9654e4539bfca1658396d0768 SHA512 62f37f9e3deb86651c92832190fa27a8e4490084c6a95f42e8a5f5668fbc7aafd9c273a2c60683c3534b614e0ca44b20d18598296f67edb0812850a50b807e77
diff --git a/app-arch/unrar/unrar-5.6.1.ebuild b/app-arch/unrar/unrar-5.6.1.ebuild
new file mode 100644
index 000000000000..a5e2977fed6f
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+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=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-arch/xar/files/xar-1.8-arm-ppc.patch b/app-arch/xar/files/xar-1.8-arm-ppc.patch
new file mode 100644
index 000000000000..b2eec5a96e81
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8-arm-ppc.patch
@@ -0,0 +1,23 @@
+--- a/lib/archive.c
++++ b/lib/archive.c
+@@ -387,7 +387,8 @@
+ 			return NULL;
+ 		}
+         
+-		XAR(ret)->heap_offset = xar_get_heap_offset(ret) + offset;
++		XAR(ret)->heap_offset =
++			XAR(ret)->toc_count + sizeof(xar_header_t) + offset;
+ 		if( lseek(XAR(ret)->fd, XAR(ret)->heap_offset, SEEK_SET) == -1 ) {
+ 			xar_close(ret);
+ 			return NULL;
+--- a/src/xar.c
++++ a/src/xar.c
+@@ -783,7 +783,7 @@
+ int main(int argc, char *argv[]) {
+ 	int ret;
+ 	char *filename = NULL;
+-	char command = 0, c;
++	signed char command = 0, c;
+ 	char **args;
+ 	const char *tocfile = NULL;
+ 	int arglen, i, err;
diff --git a/app-arch/xar/xar-1.8-r1.ebuild b/app-arch/xar/xar-1.8-r1.ebuild
new file mode 100644
index 000000000000..50016f141325
--- /dev/null
+++ b/app-arch/xar/xar-1.8-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib-minimal ltprune
+
+APPLE_PV=400
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://opensource.apple.com/source/xar/"
+SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="libressl kernel_Darwin"
+
+DEPEND="
+	!kernel_Darwin? (
+		virtual/acl
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
+	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
+)
+
+S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
+
+multilib_src_configure() {
+	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static
+}
+
+multilib_src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 346ac216be21..ba8d5424ccac 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index ffa42fddf8c6..80569395c5bf 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -1 +1 @@
-DIST moolticute-0.11.6_beta.tar.gz 5279167 BLAKE2B 4b93dbb038f75502907729398e7315397d5fd46fd7ee57214d5ea2f8dfdddd6c6d1e02242384ec8ca3a67a94711b7b3b68f28e4bb63cb24b224fcdfd75de1435 SHA512 5caf3ad6063da6d1761af37e52561b5834753abbc433e221b874788dd5c98782af8b4e723a78b2e849b8fe7cd0378e9304e5e93ac47e76d547dfc6b8ebe3c92a
+DIST moolticute-0.11.11_beta.tar.gz 5363395 BLAKE2B 0d37c3af1fb79510a7203951d28426897ee6ed4ddf53d8ac84013ca1eb939a90b4ab6008a47a2d8974588dcc0fc7109e3a7e5770783c9312ed4335e14a016b18 SHA512 5b9fd72c52eec6755474a187dcd7af9ead89e2c08504d25ab6e4ab36991e032699cb8a9e02f402f7e5e551238bcfd225d2b5415945df07ec2bde7625c7041659
diff --git a/app-crypt/moolticute/moolticute-0.11.6_beta.ebuild b/app-crypt/moolticute/moolticute-0.11.11_beta.ebuild
similarity index 100%
rename from app-crypt/moolticute/moolticute-0.11.6_beta.ebuild
rename to app-crypt/moolticute/moolticute-0.11.11_beta.ebuild
diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
index af496d8184f3..1e5b264f0c76 100644
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl qt4 +tables"
+IUSE="debug libressl +tables"
 
 CDEPEND="!libressl? ( dev-libs/openssl:0= )
 		 libressl? ( dev-libs/libressl:0= )
diff --git a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
index 661cfdd2e155..0e985ea1117c 100644
--- a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl qt4 +tables"
+IUSE="debug libressl +tables"
 
 CDEPEND="!libressl? ( dev-libs/openssl:0= )
 		 libressl? ( dev-libs/libressl:0= )
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 184116801e95..fae0481c5f06 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
index 120f33947162..c9dbd50b21e2 100644
--- a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit gnome2-utils xdg-utils
 
 DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/start"
+HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
 SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-editors/mousepad/mousepad-0.4.0.ebuild b/app-editors/mousepad/mousepad-0.4.0.ebuild
deleted file mode 100644
index e144702820d0..000000000000
--- a/app-editors/mousepad/mousepad-0.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils xfconf
-
-DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug dbus gtk3"
-
-RDEPEND=">=dev-libs/glib-2.30:2=
-	dbus? ( >=dev-libs/dbus-glib-0.100:0= )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2=
-		x11-libs/gtksourceview:2.0= )
-	gtk3? ( x11-libs/gtk+:3=
-		x11-libs/gtksourceview:3.0= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		$(use_enable dbus)
-		$(use_enable gtk3)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
-
-pkg_preinst() {
-	xfconf_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xfconf_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
new file mode 100644
index 000000000000..92b0778e2ab2
--- /dev/null
+++ b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
@@ -0,0 +1,118 @@
+diff -urN a/source/highlightData.c b/source/highlightData.c
+--- a/source/highlightData.c	2018-03-13 08:42:40.930188154 +0100
++++ b/source/highlightData.c	2018-03-13 08:44:59.651196431 +0100
+@@ -1280,7 +1280,7 @@
+     XFontStruct *font;
+     
+     if (styleNo<0)
+-        return GetDefaultFontStruct(window->fontList);
++	return GetDefaultFontStruct(TheDisplay, window->fontList);
+     fontNum = HighlightStyles[styleNo]->font;
+     if (fontNum == BOLD_FONT)
+     	font = window->boldFontStruct;
+@@ -1289,10 +1289,10 @@
+     else if (fontNum == BOLD_ITALIC_FONT)
+     	font = window->boldItalicFontStruct;
+     else /* fontNum == PLAIN_FONT */
+-    	font = GetDefaultFontStruct(window->fontList);
++	font = GetDefaultFontStruct(TheDisplay, window->fontList);
+     
+     /* If font isn't loaded, silently substitute primary font */
+-    return font == NULL ? GetDefaultFontStruct(window->fontList) : font;
++    return font == NULL ? GetDefaultFontStruct(TheDisplay, window->fontList) : font;
+ }
+ 
+ int FontOfNamedStyleIsBold(char *styleName)
+diff -urN a/source/text.c b/source/text.c
+--- a/source/text.c	2018-03-13 08:42:40.931188154 +0100
++++ b/source/text.c	2018-03-13 08:46:37.785202286 +0100
+@@ -778,9 +778,13 @@
+     textBuffer *buf;
+     Pixel white, black;
+     int textLeft;
+-    int charWidth = fs->max_bounds.width;
+-    int marginWidth = new->text.marginWidth;
+-    int lineNumCols = new->text.lineNumCols;
++    int charWidth;
++    int marginWidth;
++    int lineNumCols;
++
++    charWidth = fs->max_bounds.width;
++    marginWidth = new->text.marginWidth;
++    lineNumCols = new->text.lineNumCols;
+     
+     /* Set the initial window size based on the rows and columns resources */
+     if (request->core.width == 0)
+diff -urN a/source/window.c b/source/window.c
+--- a/source/window.c	2018-03-13 08:42:40.937188155 +0100
++++ b/source/window.c	2018-03-13 08:48:07.727207652 +0100
+@@ -1839,7 +1839,7 @@
+ 
+     /* Change the primary font in all the widgets */
+     if (primaryChanged) {
+-        font = GetDefaultFontStruct(window->fontList);
++	font = GetDefaultFontStruct(TheDisplay, window->fontList);
+         XtVaSetValues(window->textArea, textNfont, font, NULL);
+         for (i=0; i<window->nPanes; i++)
+             XtVaSetValues(window->textPanes[i], textNfont, font, NULL);
+@@ -1861,7 +1861,7 @@
+        size appropriate for the new font, but only do so if there's only
+        _one_ document in the window, in order to avoid growing-window bug */
+     if (NDocuments(window) == 1) {
+-	fontWidth = GetDefaultFontStruct(window->fontList)->max_bounds.width;
++	fontWidth = GetDefaultFontStruct(TheDisplay, window->fontList)->max_bounds.width;
+ 	fontHeight = textD->ascent + textD->descent;
+ 	newWindowWidth = (oldTextWidth*fontWidth) / oldFontWidth + borderWidth;
+ 	newWindowHeight = (oldTextHeight*fontHeight) / oldFontHeight + 
+@@ -2244,7 +2244,7 @@
+             textNrows, rows, textNcolumns, cols,
+             textNlineNumCols, lineNumCols,
+             textNemulateTabs, emTabDist,
+-            textNfont, GetDefaultFontStruct(window->fontList),
++	    textNfont, GetDefaultFontStruct(TheDisplay, window->fontList),
+             textNhScrollBar, hScrollBar, textNvScrollBar, vScrollBar,
+             textNreadOnly, IS_ANY_LOCKED(window->lockReasons),
+             textNwordDelimiters, delimiters,
+
+--- a/util/misc.c	2018-03-13 08:50:54.892217626 +0100
++++ b/util/misc.c	2018-03-13 08:56:50.346238834 +0100
+@@ -1018,7 +1018,7 @@
+ ** a Motif font list.  Since Motif stores this, it saves us from storing
+ ** it or querying it from the X server.
+ */
+-XFontStruct *GetDefaultFontStruct(XmFontList font)
++XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font)
+ {
+     XFontStruct *fs;
+     XmFontContext context;
+@@ -1028,6 +1028,17 @@
+     XmFontListGetNextFont(context, &charset, &fs);
+     XmFontListFreeFontContext(context);
+     XtFree(charset);
++
++    /* FontList might be a render table with no only XFT fonts */ 
++    if (fs == NULL) {
++	fs = XLoadQueryFont(d, "fixed");
++    }
++
++    if (fs == NULL) {
++	fprintf(stderr, "Unabled to load any fallback fonts.\n");
++	exit(EXIT_FAILURE);
++    }
++
+     return fs;
+ }
+    
+diff -urN a/util/misc.h b/util/misc.h
+--- a/util/misc.h	2018-03-13 08:50:54.890217626 +0100
++++ b/util/misc.h	2018-03-13 08:55:52.790235400 +0100
+@@ -65,7 +65,7 @@
+ void AccelLockBugPatch(Widget topWidget, Widget topMenuContainer);
+ void UpdateAccelLockPatch(Widget topWidget, Widget newButton);
+ char *GetXmStringText(XmString fromString);
+-XFontStruct *GetDefaultFontStruct(XmFontList font);
++XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font);
+ XmString* StringTable(int count, ...);
+ void FreeStringTable(XmString *table);
+ void SimulateButtonPress(Widget widget);
+
diff --git a/app-editors/nedit/files/nedit-5.6-ldflags.patch b/app-editors/nedit/files/nedit-5.6-ldflags.patch
index 4532c6251894..a549b02490c0 100644
--- a/app-editors/nedit/files/nedit-5.6-ldflags.patch
+++ b/app-editors/nedit/files/nedit-5.6-ldflags.patch
@@ -1,5 +1,5 @@
---- source/Makefile.common	2004-03-21 15:25:56.000000000 +0100
-+++ source/Makefile.common.new	2009-10-24 10:47:03.667835157 +0200
+--- a/source/Makefile.common	2004-03-21 15:25:56.000000000 +0100
++++ b/source/Makefile.common	2009-10-24 10:47:03.667835157 +0200
 @@ -21,12 +21,12 @@
  # we only want natural rebuilds to regenerate the link date.
  nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB)
diff --git a/app-editors/nedit/nedit-5.6-r2.ebuild b/app-editors/nedit/nedit-5.6-r2.ebuild
new file mode 100644
index 000000000000..a37c9fcd64a5
--- /dev/null
+++ b/app-editors/nedit/nedit-5.6-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Multi-purpose text editor for the X Window System"
+HOMEPAGE="https://sourceforge.net/projects/nedit"
+SRC_URI="
+	https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz
+	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND=">=x11-libs/motif-2.3:0
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	|| ( dev-util/yacc sys-devel/bison )
+	dev-lang/perl"
+
+S="${WORKDIR}/${PN}-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-format.patch"
+	  "${FILESDIR}/${P}-ldflags.patch"
+	  "${FILESDIR}/${P}-40_Pointer_to_Integer.patch"
+	  "${FILESDIR}/${P}-security.patch"
+	  "${FILESDIR}/${P}-fix-crash-with-noX.patch"
+)
+
+src_prepare() {
+	#respecting LDFLAGS, bug #208189
+	default
+	sed \
+		-e "s:bin/:${EPREFIX}/bin/:g" \
+		-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
+	sed \
+		-e "s:nc:neditc:g" -i doc/nc.pod || die
+	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
+		makefiles/Makefile.linux || die
+	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:"                  \
+		   -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
+		   -e "s:-lX11:-lX11 -lXmu -liconv:"                   \
+		   -e "s:check_tif_rule::"                             \
+		makefiles/Makefile.macosx || die
+}
+
+src_compile() {
+	case "${CHOST}" in
+		*-darwin*)
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
+			;;
+		*-linux*)
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
+			;;
+	esac
+	emake VERSION="NEdit ${PV}" -C doc all
+}
+
+src_install() {
+	dobin source/nedit
+	newbin source/nc neditc
+
+	make_desktop_entry "${PN}"
+	doicon "${WORKDIR}/${PN}.png"
+
+	newman doc/nedit.man nedit.1
+	newman doc/nc.man neditc.1
+
+	dodoc README ReleaseNotes ChangeLog
+	dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
+	dohtml doc/nedit.html
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5a577eacec0a..26dc69fbab7c 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 227c98819815..06078d1f435c 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,12 +1,16 @@
 DIST ovmf-20151110.tar.bz2 27518370 BLAKE2B c4ba51e59ca3f597d75639a792b1f307a70dc6127917306e6ce182a76646435bec8006f7db9ac5c580e0ad79465a2b2902cffa90139d367c89d16e28280a978b SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3
 DIST ovmf-20170321.tar.xz 22141096 BLAKE2B 79e991c8f9deb297865c319e88b6e6d46b1d08067d3fd639c83f2a379670779ecc60c74c2671ea4eb4a6659fe08ac2d7d4ff337b010b42a908a50829a2d18eeb SHA512 f65dabde3df967224e2072817211786ee4fc3994ee31f8f9d6f67fd74e3479e1da459c720169dd81020cdc1777e4600e531bb124b4625c2ded42c6005bdc802a
 DIST seabios-1.10.0.tar.gz 588213 BLAKE2B 254eb4572a1dac06020a545820efb53a130a027aaab035cd916009b424475f89bd151f82f1bc5103c01c4657d09da3219d2fbcc7728add473011dcfc7bff7410 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c
+DIST xen-4.10.0-upstream-patches-0.tar.xz 70884 BLAKE2B 9a27e7989486ba3ba59548de356384527cc5b78e63b6ed042506e6534e488272369f021cd2daa516820313c3fe18625a5864794ae0806e7018b8ad28b0a294b1 SHA512 e64bf1d30d24e922c60c3b518a4de7874b43cc695134b4cdd65f6d95ae9ae579c521fab13ca82409fde55e43815d072c3194997e2bda106204cbf329e93a0a00
+DIST xen-4.10.0.tar.gz 24618123 BLAKE2B 009faa980f9734525c137d525e626bfa3443c285aeb6b4af91bb2c32a2e98376ded0b1114b541d11e2d4353f4f588d58e8add5b1e0d7de2fe3399d4687c5bfae SHA512 5a37935c382f9cfe3641a35c3be0ba11689bca10c7d3c2401963513e3a834ee8d0c8a0ddcf3716dbf0a795aea1bab78caf19acf1272e5e054bf012cfa06a4690
 DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 BLAKE2B cbc7bad4703fabd05b703c66268df0670e2ae97b77007895dceaf6465b12a2f9fbe3773c7735b307427ad18c61711b20beb7f3ae6b1f1b8b5efda2a847fec0ec SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d
 DIST xen-4.8.2.tar.gz 22522336 BLAKE2B 2c9da971622b4e52fe78fa029107bb1c5f945a63605406493df607c410c6f2a8c2cdb38b1eb30c1bc1c8bc6e5620efad977c3ba55e04c579c01d51f0104afcce SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da
 DIST xen-4.9.0-upstream-patches-0.tar.xz 58780 BLAKE2B 6d12a5a5bb7d2be7ca6bb8636648ee219c9526dd34086c929d8cd32d096d2454d6cb499d459b436f228fa49f42ef3a1f5fbe9b5c84557e4054565a9edc0daad6 SHA512 98c601d791661a306e3dce5befb37b80de8a71cdd1759f3da00b199d48e3b9468efd1332e26ae044ad616b41a02771ad07a1c96972103b7e0aa39b93fb556999
 DIST xen-4.9.0.tar.gz 23361741 BLAKE2B 1cfebb791ca5e51eda9b86a5d98e0883fab1554f5ac805fc065916fbbd3695e6b0f11ca75935a8f973735cc8dd83e38fe4a670d8489010be865be49d8fc1a341 SHA512 97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f
 DIST xen-4.9.1-upstream-patches-1.tar.xz 24592 BLAKE2B 774c5219d6c14d729358e790d880a1a31fb4cda741e54e71879bff164e79bafbd8492eb8bccb7becdf7a2f9605e71266bb4fc15848deff8f9028ed7f8844f915 SHA512 edbc7cad2f6f8a5c7e8aac8efd5454428aa25e0e13018438f78c7f401cfb9173345267e16c7a5dfa78066a952980b172976409a0c63162094b7f507058e712ed
+DIST xen-4.9.1-upstream-patches-2.tar.xz 84228 BLAKE2B 3b98cdb1202d4c9817dd1919b9dc5d4c06510d3be2c077b2e41334928bca07c65a9d8a421fc2a1ae3b806e69f7b61334f7c54d48952c98192ece4b5826539df8 SHA512 673520bff88fa401e1d1c7accc8d3650d4d74a9e52bc7195cfcb5335226c69ef0230e7db719fd97ce6df2f5198646ae0fbccc6f812d7e9ccd38a6eef359d287c
 DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274
 DIST xen-gentoo-patches-10.tar.xz 27876 BLAKE2B 8efece8548a046b47c04e5b9354ca8bdff55affd6c6bc67315ac7536778fbaa183d346e0ff83e365030df2433bddf845188a1c3fb8feaea2e93d5ba0dd1c779a SHA512 2033f4cb671971c73841cfaa7eb46623c37778c5746b47302eee252c4af287ccbeb8d1884ffdf32cd97a38cd7785257d56f13ef20d4c03dc0fb1cb196dc04ece
+DIST xen-gentoo-patches-12.tar.xz 28188 BLAKE2B 75f565d52e75d4f68d7a1be88a79e7cefe82350ca1f4852ecdb79137549d73ef1ffb665bac998956a6f180cde6faeb9a11ec1f5442c8ae53c7cbd869318ef315 SHA512 4e1ebbd244670d3a4171fd93eda7eb14deae3e3ad45b3a85c015696ff0a86b69156f24ee428d6c92b7be426938997cec2fab031ecb5b03ad26a38451523882de
 DIST xen-ovmf-patches-2.tar.xz 4344 BLAKE2B 1514c89dcba05c84281e9d46ec5c3e9e946ea777dcbe64d1d7689298e187aac2c9a5febf407d79bdb3ebe47563972ea66e0f5204590c5abc98df9cf24549b92d SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 1d98a23ac5d4..5c43ec70adb7 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -64,6 +64,7 @@ _gx023=" qemu-bridge.patch"
 _gx025=" xen-4.4-qemu-bridge.patch"
 _gx031=" xen-4.5-qemu-bridge.patch"
 _gx039=" xen-4.8-qemu-bridge.patch"
+_gx043=" xen-4.10-qemu-bridge.patch"
 #mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
 
 _gx026=" xen-tools-4.4-api-fix.patch"
@@ -101,6 +102,9 @@ _gx041=" 0002-tools-libxc-Tolerate-zero-length-records-in-migratio.patch"
 #Fix missing makedev(), major(), minor()
 _gx042=" xen-tools-4.8.2-makedev.patch"
 
+# Fix building with glibc 2.27, bug #648182
+_gx044=" xen-tools-4.9-glibc-memfd.patch"
+
 # xen-tools-4.8.2 patches set
 _gpv_xen_tools_482_0="
 ${_gx008}
@@ -118,6 +122,7 @@ ${_gx027}
 ${_gx028} ${_gx029}
 ${_gx037} ${_gx042}
 "
+
 # xen-tools-4.9.1 patches set
 _gpv_xen_tools_491_0="
 ${_gx008}
@@ -126,3 +131,22 @@ ${_gx027}
 ${_gx028} ${_gx029}
 ${_gx037} ${_gx042}
 "
+
+_gpv_xen_tools_491_1="
+${_gx008}
+${_gx038} ${_gx017} ${_gx039}
+${_gx027}
+${_gx028} ${_gx029}
+${_gx037} ${_gx042}
+${_gx044}
+"
+
+# xen-tools-4.10.0 patches set
+_gpv_xen_tools_4100_0="
+${_gx008}
+${_gx038} ${_gx017} ${_gx043}
+${_gx027}
+${_gx028} ${_gx029}
+${_gx037} ${_gx042}
+${_gx044}
+"
diff --git a/app-emulation/xen-tools/xen-tools-4.10.0.ebuild b/app-emulation/xen-tools/xen-tools-4.10.0.ebuild
new file mode 100644
index 000000000000..03bc0dd63837
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.10.0.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=12
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=3
+
+	SEABIOS_VER=1.10.0
+	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
+	OVMF_PV=20170321
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED%/}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+	use doc && dodoc -r docs/{pdf,txt}
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild
new file mode 100644
index 000000000000..0ef35d660eb6
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=12
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=1
+	# xen-tools ovmf's patches
+	OVMF_VER=3
+
+	SEABIOS_VER=1.10.0
+	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
+	OVMF_PV=20170321
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED%/}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+	use doc && dodoc -r docs/{pdf,txt}
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 04bb8fc006c1..bb016bd2a4c4 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,3 +1,5 @@
+DIST xen-4.10.0-upstream-patches-0.tar.xz 70884 BLAKE2B 9a27e7989486ba3ba59548de356384527cc5b78e63b6ed042506e6534e488272369f021cd2daa516820313c3fe18625a5864794ae0806e7018b8ad28b0a294b1 SHA512 e64bf1d30d24e922c60c3b518a4de7874b43cc695134b4cdd65f6d95ae9ae579c521fab13ca82409fde55e43815d072c3194997e2bda106204cbf329e93a0a00
+DIST xen-4.10.0.tar.gz 24618123 BLAKE2B 009faa980f9734525c137d525e626bfa3443c285aeb6b4af91bb2c32a2e98376ded0b1114b541d11e2d4353f4f588d58e8add5b1e0d7de2fe3399d4687c5bfae SHA512 5a37935c382f9cfe3641a35c3be0ba11689bca10c7d3c2401963513e3a834ee8d0c8a0ddcf3716dbf0a795aea1bab78caf19acf1272e5e054bf012cfa06a4690
 DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 BLAKE2B cbc7bad4703fabd05b703c66268df0670e2ae97b77007895dceaf6465b12a2f9fbe3773c7735b307427ad18c61711b20beb7f3ae6b1f1b8b5efda2a847fec0ec SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d
 DIST xen-4.8.2-upstream-patches-3.tar.xz 49836 BLAKE2B c0f79727afdeb172a45c9bc0553bfbac865998e6b36364d38899201aa649dc338b77a899758516823112970163f9c9596b5e3940aee132561c62f2a245f4ba3f SHA512 d87702ba64c85fed2617912582979a96c708c610c38adfa57a6e5085bead06907c3917f3e344afa91c7b72a6c044a1711f5ba2ba2360737c774d5f9bec92d786
 DIST xen-4.8.2.tar.gz 22522336 BLAKE2B 2c9da971622b4e52fe78fa029107bb1c5f945a63605406493df607c410c6f2a8c2cdb38b1eb30c1bc1c8bc6e5620efad977c3ba55e04c579c01d51f0104afcce SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da
@@ -5,4 +7,5 @@ DIST xen-4.9.0-upstream-patches-0.tar.xz 58780 BLAKE2B 6d12a5a5bb7d2be7ca6bb8636
 DIST xen-4.9.0.tar.gz 23361741 BLAKE2B 1cfebb791ca5e51eda9b86a5d98e0883fab1554f5ac805fc065916fbbd3695e6b0f11ca75935a8f973735cc8dd83e38fe4a670d8489010be865be49d8fc1a341 SHA512 97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f
 DIST xen-4.9.1-upstream-patches-0.tar.xz 6856 BLAKE2B 52a7e3b456d330444166c36ce68b008150831b7bb5b64b4a3dbebfbbe8cd024311f3d7aadd1313b194bd5ce7a20cd2ca5a424754e59589b986490eda97bf5d06 SHA512 9af8861443a708c60df52c21512099a55a6018238350ece962a715b07ade9141cab2d46540b5d5e8e20347980f786f7d28ec130f7e8e03c46ff4808d3b36a913
 DIST xen-4.9.1-upstream-patches-1.tar.xz 24592 BLAKE2B 774c5219d6c14d729358e790d880a1a31fb4cda741e54e71879bff164e79bafbd8492eb8bccb7becdf7a2f9605e71266bb4fc15848deff8f9028ed7f8844f915 SHA512 edbc7cad2f6f8a5c7e8aac8efd5454428aa25e0e13018438f78c7f401cfb9173345267e16c7a5dfa78066a952980b172976409a0c63162094b7f507058e712ed
+DIST xen-4.9.1-upstream-patches-2.tar.xz 84228 BLAKE2B 3b98cdb1202d4c9817dd1919b9dc5d4c06510d3be2c077b2e41334928bca07c65a9d8a421fc2a1ae3b806e69f7b61334f7c54d48952c98192ece4b5826539df8 SHA512 673520bff88fa401e1d1c7accc8d3650d4d74a9e52bc7195cfcb5335226c69ef0230e7db719fd97ce6df2f5198646ae0fbccc6f812d7e9ccd38a6eef359d287c
 DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274
diff --git a/app-emulation/xen/xen-4.10.0.ebuild b/app-emulation/xen/xen-4.10.0.ebuild
new file mode 100644
index 000000000000..8027e789237b
--- /dev/null
+++ b/app-emulation/xen/xen-4.10.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/app-emulation/xen/xen-4.9.1-r2.ebuild b/app-emulation/xen/xen-4.9.1-r2.ebuild
new file mode 100644
index 000000000000..42dbb4d46423
--- /dev/null
+++ b/app-emulation/xen/xen-4.9.1-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 36743b982cc5..d731f9aa1ef6 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
index 84b728f940e6..b3af5b6c6a20 100644
--- a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86"
 IUSE="cpu_flags_x86_sse2 static-libs test"
 
 PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision-r1.patch" )
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d10d6500e2b6..49a6be59fca0 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
index e1a84f81fed2..9b2301075fab 100644
--- a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pdfpc/pdfpc-3.1.1.ebuild b/app-misc/pdfpc/pdfpc-3.1.1.ebuild
index 73e354cf2efb..b84136261d30 100644
--- a/app-misc/pdfpc/pdfpc-3.1.1.ebuild
+++ b/app-misc/pdfpc/pdfpc-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="app-text/poppler:=[cairo]
+RDEPEND="app-text/poppler[cairo]
 	dev-libs/glib:2
 	dev-libs/libgee:0
 	gnome-base/librsvg
diff --git a/app-misc/pdfpc/pdfpc-4.0.7.ebuild b/app-misc/pdfpc/pdfpc-4.0.7.ebuild
index 9809d85cddbf..dae4ac40e486 100644
--- a/app-misc/pdfpc/pdfpc-4.0.7.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gstreamer"
 
-RDEPEND="app-text/poppler:=[cairo]
+RDEPEND="app-text/poppler[cairo]
 	dev-libs/glib:2
 	dev-libs/libgee:0.8
 	gnome-base/librsvg
diff --git a/app-misc/pdfpc/pdfpc-4.0.8.ebuild b/app-misc/pdfpc/pdfpc-4.0.8.ebuild
index 9809d85cddbf..dae4ac40e486 100644
--- a/app-misc/pdfpc/pdfpc-4.0.8.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gstreamer"
 
-RDEPEND="app-text/poppler:=[cairo]
+RDEPEND="app-text/poppler[cairo]
 	dev-libs/glib:2
 	dev-libs/libgee:0.8
 	gnome-base/librsvg
diff --git a/app-misc/timew/Manifest b/app-misc/timew/Manifest
index 0e679c6e27ca..c27519ec95fe 100644
--- a/app-misc/timew/Manifest
+++ b/app-misc/timew/Manifest
@@ -1 +1,2 @@
 DIST timew-1.0.0.tar.gz 140539 BLAKE2B 486c1e99a587597a040e3fb45c15602e56798b5a13ce3f47fb8d73b3995ee270ef2601e49dc4efe3023d1179a111b55c50c92a3feece87d9bad6a26123dc9008 SHA512 0539ff93b2375c154d126c39aa84f21b57b62f51c220c80b2e323a4d6aefd2eda6f87c04112e096222102b019ee3683a78b9ee9d6fbf6736d4a34c529f6152f5
+DIST timew-1.1.1.tar.gz 166484 BLAKE2B 64b8560220550299c76207873184252b1100d146ac745e46f38790a90294c59e5da95852836433f1d5213a2f1272063a534c20b2963a88fbaa1bcb888e40b70b SHA512 d262227d6dc99994599252c9fc55d32e4caac9d5ff1f223b8637005ed9f4f7fa238bd5cb7392c8e42a468f6246a7afad9b6fdb02af636e53d3bd813cfc3ee110
diff --git a/app-misc/timew/timew-1.1.1.ebuild b/app-misc/timew/timew-1.1.1.ebuild
new file mode 100644
index 000000000000..751d9bdd68d9
--- /dev/null
+++ b/app-misc/timew/timew-1.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Tracks your time from the command line, and generates reports"
+HOMEPAGE="https://taskwarrior.org/news/news.20160821.html"
+SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DTIMEW_DOCDIR=share/doc/${PF}
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 08863ccc08dd..81bdce719eef 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/calligra/calligra-3.0.1.ebuild b/app-office/calligra/calligra-3.0.1.ebuild
index 730f9e6ad9ca..7a2d180f4ec7 100644
--- a/app-office/calligra/calligra-3.0.1.ebuild
+++ b/app-office/calligra/calligra-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -91,7 +91,7 @@ COMMON_DEPEND="
 		media-libs/lcms:2
 	)
 	openexr? ( media-libs/openexr )
-	pdf? ( app-text/poppler:=[qt5] )
+	pdf? ( app-text/poppler[qt5] )
 	phonon? ( media-libs/phonon[qt5(+)] )
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
diff --git a/app-office/calligra/calligra-3.1.0-r1.ebuild b/app-office/calligra/calligra-3.1.0-r1.ebuild
index 7a42c16449ac..d0f98bb0a470 100644
--- a/app-office/calligra/calligra-3.1.0-r1.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r1.ebuild
@@ -97,7 +97,7 @@ COMMON_DEPEND="
 		media-libs/lcms:2
 	)
 	openexr? ( media-libs/openexr )
-	pdf? ( app-text/poppler:=[qt5] )
+	pdf? ( app-text/poppler[qt5] )
 	phonon? ( media-libs/phonon[qt5(+)] )
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
diff --git a/app-office/kmymoney/kmymoney-5.0.0.ebuild b/app-office/kmymoney/kmymoney-5.0.0-r1.ebuild
similarity index 96%
rename from app-office/kmymoney/kmymoney-5.0.0.ebuild
rename to app-office/kmymoney/kmymoney-5.0.0-r1.ebuild
index 7afd40004fc9..46fb7493d352 100644
--- a/app-office/kmymoney/kmymoney-5.0.0.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.0-r1.ebuild
@@ -30,17 +30,19 @@ COMMON_DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
 	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtsql)
 	$(add_qt_dep qtsvg)
diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 85a102a443dd..b65910862d8b 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
 
 #a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
diff --git a/app-office/texmaker/texmaker-4.5-r2.ebuild b/app-office/texmaker/texmaker-4.5-r2.ebuild
index e46b14878904..2c65b02c9180 100644
--- a/app-office/texmaker/texmaker-4.5-r2.ebuild
+++ b/app-office/texmaker/texmaker-4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	app-text/poppler:=[qt5]
+	app-text/poppler[qt5]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/app-office/texmaker/texmaker-4.5-r3.ebuild b/app-office/texmaker/texmaker-4.5-r3.ebuild
index b33ba0007afe..79f1a8da1221 100644
--- a/app-office/texmaker/texmaker-4.5-r3.ebuild
+++ b/app-office/texmaker/texmaker-4.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	app-text/poppler:=[qt5]
+	app-text/poppler[qt5]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/app-office/texmaker/texmaker-5.0-r1.ebuild b/app-office/texmaker/texmaker-5.0-r1.ebuild
index f91b5375634a..f9febdd05987 100644
--- a/app-office/texmaker/texmaker-5.0-r1.ebuild
+++ b/app-office/texmaker/texmaker-5.0-r1.ebuild
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	app-text/poppler:=[qt5(+)]
+	app-text/poppler[qt5(+)]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild b/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild
deleted file mode 100644
index d892d28e7b2d..000000000000
--- a/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font gnome2-utils unpacker versionator xdg
-
-MY_PV="$(get_version_component_range 1-4)"
-MY_V="$(get_version_component_range 5)"
-
-if [ -z "$(get_version_component_range 6)" ]; then
-	MY_SP=""
-else
-	MY_SP="$(get_version_component_range 6)"
-fi
-
-case ${PV} in
-	*_alpha*)
-		MY_BRANCH=${MY_V/alpha/a}
-		;;
-	*_beta*)
-		MY_BRANCH=${MY_V/beta/b}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-MY_VV=${MY_PV}~${MY_BRANCH}${MY_SP}
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="http://linux.wps.cn/ http://wps-community.org/"
-
-KEYWORDS="~amd64 ~x86"
-
-SRC_URI="
-	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_i386.deb )
-	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_amd64.deb )
-"
-
-SLOT="0"
-RESTRICT="strip mirror" # mirror as explained at bug #547372
-LICENSE="WPS-EULA"
-IUSE="+sharedfonts"
-
-# Deps got from this (listed in order):
-# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
-# ldd /opt/kingsoft/wps-office/office6/wps
-# ldd /opt/kingsoft/wps-office/office6/wpp
-RDEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-	sys-devel/gcc
-	sys-libs/glibc
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	dev-libs/glib:2
-	sys-libs/zlib:0
-	net-print/cups
-	media-libs/libpng:1.2
-	virtual/glu
-
-	dev-libs/libpcre:3
-	dev-libs/libffi
-	media-sound/pulseaudio
-	app-arch/bzip2:0
-	media-libs/libpng:0
-	dev-libs/expat
-	sys-apps/util-linux
-	dev-libs/libbsd
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	sys-apps/dbus
-	x11-libs/libXtst
-	sys-apps/systemd
-	sys-apps/tcp-wrappers
-	media-libs/libsndfile
-	net-libs/libasyncns
-	dev-libs/libgcrypt:0
-	app-arch/xz-utils
-	app-arch/lz4
-	sys-libs/libcap
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-libs/libgpg-error
-	sys-apps/attr
-"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/wps
-	doexe "${S}"/usr/bin/wpp
-	doexe "${S}"/usr/bin/et
-
-	if ! use sharedfonts; then
-		insinto /opt/kingsoft/wps-office/office6/fonts
-		doins -r "${S}"/usr/share/fonts/wps-office/*
-		rm -rf "${S}"/usr/share/fonts || die
-	fi
-
-	insinto /usr
-	doins -r "${S}"/usr/share
-
-	insinto /
-	doins -r "${S}"/opt
-	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use sharedfonts && font_pkg_postinst
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 72d403df5bcd..216a80057508 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 202e1041730d..a89a501087a1 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +1,2 @@
-DIST gemato-10.3.tar.gz 63279 BLAKE2B 317c98c3989399e3a87cd5452edc509da86b17ecb41d295feca4071141d3ff1ba95a86544d64c786726f2148a899c1597020dde3513a913b1bc1811e2117337e SHA512 dd2b47238ac0707984358bd763ce0dfb23d8b09561939d22aae2e60386de388af9c5e67faa89a6ab9da4f0b334ee8486eeda66e5eb83bd2a26241b8a2b88128d
-DIST gemato-11.0.tar.gz 64123 BLAKE2B c1020368eca1f8914c2377e23b27e953e06268e70754e2265af6d31defb2960263371aa6cbfb22b046d1bbdf549c948b62858d09055e8813fc9148a28c264a81 SHA512 c9ba297950a96fc7c07f88b8dcda33c3f351043ca062c354425be43ce4915b5ee37d6a28122797cfc01152546e72eda647e27f764b53345bfef87b292dd893e7
-DIST gemato-11.1.tar.gz 64338 BLAKE2B 672816956115bcf9a8f4832d8ca6af290d5ea2db213fbf485e969ec6f1c79e1f9a42590a8b88e7c204608ee8a1e2d2e7935b02a046fc08730dac667e5e371d09 SHA512 518f2728564a70e1758c3ee1290b01a27815fb51a64e632ad08fc6481becc0bf03756270aa2eed3fc3403557226c00a3f6099e73cd110532455ead515b37e109
 DIST gemato-11.2.tar.gz 66260 BLAKE2B 94b7f4a6718314e767676589b10addb05d52133e7e860b257cb558f31ffea27c88bc06bfd2fed7268bfd34179aaee77a9a6e7ffd3bd3fc4e43987e719d809f1e SHA512 61c5a8dccbb99c5ff7880a4e3d26a3f468a70e9622b7aebf53d312cc7105ec7c9abb04d00acdfa9cac29c4779b267abc35074272b7c921f8221d18383b0d445c
+DIST gemato-12.0.tar.gz 66625 BLAKE2B 736593356edb10c3e46f70dc12c91712d263f6814e6b786fd63219f05d55eda8f305309d24b7043d969aad5e394b590c3e054f2e91a4d9cc539fdc809e13e1ff SHA512 a7a31e55574e15754ed8cce65a9bbd41fe16f71a641ebc2e5054c8dfacc10c21f22b580edbe3cc001253b4ab7276d02b6dfe81b30e68e009bd24d22b2dd100ed
diff --git a/app-portage/gemato/gemato-11.0.ebuild b/app-portage/gemato/gemato-11.0.ebuild
deleted file mode 100644
index 6dd1dc95ea59..000000000000
--- a/app-portage/gemato/gemato-11.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gemato/gemato-11.1.ebuild b/app-portage/gemato/gemato-11.1.ebuild
deleted file mode 100644
index 6dd1dc95ea59..000000000000
--- a/app-portage/gemato/gemato-11.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gemato/gemato-10.3-r1.ebuild b/app-portage/gemato/gemato-12.0.ebuild
similarity index 91%
rename from app-portage/gemato/gemato-10.3-r1.ebuild
rename to app-portage/gemato/gemato-12.0.ebuild
index 6dd1dc95ea59..41600021c7a3 100644
--- a/app-portage/gemato/gemato-10.3-r1.ebuild
+++ b/app-portage/gemato/gemato-12.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test"
 
 MODULE_RDEPEND="
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 48680412f45e..f48c6851001d 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash-completion/bash-completion-2.7-r3.ebuild b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
new file mode 100644
index 000000000000..b7746efc1399
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASHCOMP_P=bashcomp-2.0.2
+inherit versionator
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
+
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE="test"
+# Multiple test failures, need to investigate the exact problem
+RESTRICT="test"
+
+# completion collision with net-fs/mc
+RDEPEND=">=app-shells/bash-4.3_p30-r1
+	sys-apps/miscfiles
+	!app-eselect/eselect-bashcomp
+	!!net-fs/mc"
+DEPEND="app-arch/xz-utils
+	test? (
+		${RDEPEND}
+		app-misc/dtach
+		dev-util/dejagnu
+		dev-tcltk/tcllib
+	)"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+# Remove unwanted completions.
+STRIP_COMPLETIONS=(
+	# Slackware package stuff, quite generic names cause collisions
+	# (e.g. with sys-apps/pacman)
+	explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+	# Debian/Red Hat network stuff
+	ifdown ifup ifstatus
+
+	# Installed in app-editors/vim-core
+	xxd
+
+	# Now-dead symlinks to deprecated completions
+	hd ncal
+
+	# Installed by sys-apps/util-linux-2.28
+	mount umount mount.linux umount.linux
+
+	# Installed by sys-apps/util-linux-2.31
+	rfkill
+)
+
+src_prepare() {
+	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
+	# Bug 543100, update bug 601194
+	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
+	eapply_user
+
+	# Remove implicit completions for vim.
+	# https://bugs.gentoo.org/649986
+	sed -i -e 's/vi vim gvim rvim view rview rgvim rgview gview//' \
+		bash_completion || die
+	rm test/completion/vi.exp || die
+}
+
+src_test() {
+	# Tests need an interactive shell, #477066
+	# idea stolen from:
+	# http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	local file
+	for file in "${STRIP_COMPLETIONS[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+	done
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+
+	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+	# install the eselect module
+	insinto /usr/share/eselect/modules
+	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.1-r90 ${v}; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 5a21ed358e41..79657c0d217b 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -60,6 +60,13 @@ src_unpack() {
 src_prepare() {
 	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
 	eapply_user
+
+	# Remove implicit completions for vim.
+	# https://bugs.gentoo.org/649986
+	sed -i -e 's/vi vim gvim rvim view rview rgvim rgview gview//' \
+		bash_completion || die
+	rm test/completion/vi.exp || die
+
 	eautoreconf
 }
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ed89de2250cd..dd03c54f66f4 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/apvlv/apvlv-0.1.5-r1.ebuild b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
index 2b1eafbedf1c..22f455810c41 100644
--- a/app-text/apvlv/apvlv-0.1.5-r1.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ KEYWORDS="amd64 x86"
 IUSE="debug djvu"
 
 RDEPEND="
-	>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)]
+	>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
 	dev-libs/glib:2
 	x11-libs/gtk+:3
 	djvu? ( app-text/djvu:= )
diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
index ba041b48bf20..2b8f04dccb92 100644
--- a/app-text/apvlv/apvlv-0.1.5-r2.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug djvu"
 
 RDEPEND="
-	>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)]
+	>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
 	dev-libs/glib:2
 	x11-libs/gtk+:3
 	djvu? ( app-text/djvu:= )
diff --git a/app-text/atril/atril-1.12.2-r5.ebuild b/app-text/atril/atril-1.12.2-r5.ebuild
index 360dac80db22..582095d7761e 100644
--- a/app-text/atril/atril-1.12.2-r5.ebuild
+++ b/app-text/atril/atril-1.12.2-r5.ebuild
@@ -20,7 +20,7 @@ IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscrip
 REQUIRED_USE="t1lib? ( dvi )
 	!gtk3? ( !epub )" #608604
 
-RDEPEND=">=app-text/poppler-0.16:0=[cairo]
+RDEPEND=">=app-text/poppler-0.16[cairo]
 	app-text/rarian:0
 	dev-libs/atk:0
 	>=dev-libs/glib-2.36:2
diff --git a/app-text/atril/atril-1.14.2-r2.ebuild b/app-text/atril/atril-1.14.2-r2.ebuild
index 792c2c2e6a06..d3ef2efb7e21 100644
--- a/app-text/atril/atril-1.14.2-r2.ebuild
+++ b/app-text/atril/atril-1.14.2-r2.ebuild
@@ -20,7 +20,7 @@ IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscrip
 REQUIRED_USE="t1lib? ( dvi )
 	!gtk3? ( !epub )" #608604
 
-COMMON_DEPEND=">=app-text/poppler-0.16:0=[cairo]
+COMMON_DEPEND=">=app-text/poppler-0.16[cairo]
 	dev-libs/atk:0
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.5:2
diff --git a/app-text/atril/atril-1.16.1-r2.ebuild b/app-text/atril/atril-1.16.1-r2.ebuild
index 24aad9d4f3c7..41128c94216b 100644
--- a/app-text/atril/atril-1.16.1-r2.ebuild
+++ b/app-text/atril/atril-1.16.1-r2.ebuild
@@ -20,7 +20,7 @@ IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscrip
 REQUIRED_USE="t1lib? ( dvi )
 	!gtk3? ( !epub )" #608604
 
-COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
+COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
 	dev-libs/atk:0
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.5:2
diff --git a/app-text/atril/atril-1.18.3.ebuild b/app-text/atril/atril-1.18.3.ebuild
index 4769e545a0a9..e4db37226f49 100644
--- a/app-text/atril/atril-1.18.3.ebuild
+++ b/app-text/atril/atril-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1l
 
 REQUIRED_USE="t1lib? ( dvi )"
 
-COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
+COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
 	dev-libs/atk:0
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.5:2
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index bed6d317dea6..f563c96aa6c4 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.13.1.tar.xz 315300 BLAKE2B e764854004bc51c2636fd7459018241835908473838e6fd242e09dbbf4e631c66a68af4c566eb6cd096302079323c74e124093989c9d3ed0ea909f7316c4913c SHA512 3fcb7440707a671c3d077cad0bbd3f2b2a09faacc2abaede6ee18f6a7d5d9e315922ae1f281cb5a1742073401882ecce0983be24f70373a4741016a3b8042dbc
+DIST blogc-0.13.2.tar.xz 315832 BLAKE2B f5a8392318a96bc4356b6df4386cbd2b1037fe5e6ed2a6f4bebbf02221a0775601dd39dc06995e3846e224d3597dd8b7537bc6309f46b63abe1bab37dbc80f8d SHA512 1c5a987e6ac7b1460082f2f50cadee645113134f925e331dd2c8b40f0284cbca855db969aaf624cfff503b8040094168c743f4c0d7832bea6f7a9b0b5d044cee
diff --git a/app-text/blogc/blogc-0.13.1.ebuild b/app-text/blogc/blogc-0.13.2.ebuild
similarity index 100%
rename from app-text/blogc/blogc-0.13.1.ebuild
rename to app-text/blogc/blogc-0.13.2.ebuild
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
similarity index 86%
rename from app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
rename to app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
index 1de17d540dfc..379468357300 100644
--- a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
+++ b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit desktop qmake-utils
 
 DESCRIPTION="Program that textually or visually compares two PDF files"
-HOMEPAGE="http://www.qtrac.eu/diffpdf.html"
+HOMEPAGE="https://www.qtrac.eu/diffpdf.html"
 SRC_URI="http://www.qtrac.eu/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -15,9 +15,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	app-text/poppler:=[qt5]
+	app-text/poppler[qt5]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
diff --git a/app-text/libmspub/libmspub-0.1.2.ebuild b/app-text/libmspub/libmspub-0.1.2.ebuild
index 840b2e136a89..16c01c8e0026 100644
--- a/app-text/libmspub/libmspub-0.1.2.ebuild
+++ b/app-text/libmspub/libmspub-0.1.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
index 5fdcb9fca1b4..8b5620ff3549 100644
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/73"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/qpdf/qpdf-7.0.0.ebuild b/app-text/qpdf/qpdf-7.0.0.ebuild
index 3d3aa36aea79..90ccfa2f8961 100644
--- a/app-text/qpdf/qpdf-7.0.0.ebuild
+++ b/app-text/qpdf/qpdf-7.0.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/18"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/app-text/referencer/referencer-1.2.2.ebuild b/app-text/referencer/referencer-1.2.2.ebuild
index cbd54159ff5d..06a5922851df 100644
--- a/app-text/referencer/referencer-1.2.2.ebuild
+++ b/app-text/referencer/referencer-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ IUSE=""
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=app-text/poppler-0.12.3-r3:=[cairo]
+	>=app-text/poppler-0.12.3-r3[cairo]
 	>=dev-cpp/gtkmm-2.8:*
 	>=dev-cpp/libglademm-2.6.0
 	>=dev-cpp/gconfmm-2.14.0
diff --git a/app-text/texlive-core/texlive-core-2016-r6.ebuild b/app-text/texlive-core/texlive-core-2016-r6.ebuild
index 58e114f08446..1b5dcd1fa851 100644
--- a/app-text/texlive-core/texlive-core-2016-r6.ebuild
+++ b/app-text/texlive-core/texlive-core-2016-r6.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-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index 9aedb1a07870..b2285a763280 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.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/texlive-2017.ebuild b/app-text/texlive/texlive-2017.ebuild
index b0bf24656cec..4d0863a39f79 100644
--- a/app-text/texlive/texlive-2017.ebuild
+++ b/app-text/texlive/texlive-2017.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~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 ~arm64 ~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="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-text/xapian-omega/xapian-omega-1.2.24.ebuild b/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
index 34228da944be..461cf699baeb 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
diff --git a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
index e690281efef6..b7f2da1d327f 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
diff --git a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
index e1d29c7a0e86..00a7af4ec641 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
diff --git a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
index 30c6df2a77d4..69bb116aaa81 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
diff --git a/app-text/xournal/xournal-0.4.8-r1.ebuild b/app-text/xournal/xournal-0.4.8-r1.ebuild
index b30ab3a5467f..69d6ceebd250 100644
--- a/app-text/xournal/xournal-0.4.8-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE="+pdf vanilla"
 
 COMMONDEPEND="
-	app-text/poppler:=[cairo]
+	app-text/poppler[cairo]
 	dev-libs/atk
 	dev-libs/glib
 	gnome-base/libgnomecanvas
diff --git a/app-text/xournal/xournal-0.4.8.ebuild b/app-text/xournal/xournal-0.4.8.ebuild
index 1b5655d9ad20..1e879f6a6f85 100644
--- a/app-text/xournal/xournal-0.4.8.ebuild
+++ b/app-text/xournal/xournal-0.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE="+pdf"
 
 COMMONDEPEND="
-	app-text/poppler:=[cairo]
+	app-text/poppler[cairo]
 	dev-libs/atk
 	dev-libs/glib
 	gnome-base/libgnomecanvas
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
index 61353ac0307f..422842c0e82f 100644
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE="+pdf"
 
 COMMONDEPEND="
-	app-text/poppler:=[cairo]
+	app-text/poppler[cairo]
 	dev-libs/atk
 	dev-libs/glib
 	gnome-base/libgnomecanvas
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
index 9d5af0ac9e48..c27384680f4d 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE=""
 
-RDEPEND="app-text/poppler:=[cairo]
+RDEPEND="app-text/poppler[cairo]
 	>=app-text/zathura-0.2.7
 	x11-libs/cairo:="
 DEPEND="${RDEPEND}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
index bf7a74bb4025..ca0b8305c134 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE=""
 
-RDEPEND="app-text/poppler:=[cairo]
+RDEPEND="app-text/poppler[cairo]
 	>=app-text/zathura-0.3.8
 	x11-libs/cairo:="
 DEPEND="${RDEPEND}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index bf7a74bb4025..ca0b8305c134 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE=""
 
-RDEPEND="app-text/poppler:=[cairo]
+RDEPEND="app-text/poppler[cairo]
 	>=app-text/zathura-0.3.8
 	x11-libs/cairo:="
 DEPEND="${RDEPEND}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 0ad01f1dbe48..80c9e37dda6d 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/pathogen/pathogen-2.4.ebuild b/app-vim/pathogen/pathogen-2.4.ebuild
index b3e2872fcac7..fc4009c0861d 100644
--- a/app-vim/pathogen/pathogen-2.4.ebuild
+++ b/app-vim/pathogen/pathogen-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: manage your runtimepath"
-HOMEPAGE="https://github.com/tpope/vim-pathogen/ http://www.vim.org/scripts/script.php?script_id=2332"
+HOMEPAGE="https://github.com/tpope/vim-pathogen/ https://www.vim.org/scripts/script.php?script_id=2332"
 SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim"
 KEYWORDS="amd64 x86 ~x64-macos"
diff --git a/app-vim/rails/rails-5.1.ebuild b/app-vim/rails/rails-5.1.ebuild
index 8ccec2791abc..10a6335781c2 100644
--- a/app-vim/rails/rails-5.1.ebuild
+++ b/app-vim/rails/rails-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ MY_PN="vim-rails"
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="vim plugin: aids developing Ruby on Rails applications"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/"
 SRC_URI="https://github.com/tpope/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim"
 KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/rails/rails-5.2.ebuild b/app-vim/rails/rails-5.2.ebuild
index 8ccec2791abc..10a6335781c2 100644
--- a/app-vim/rails/rails-5.2.ebuild
+++ b/app-vim/rails/rails-5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ MY_PN="vim-rails"
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="vim plugin: aids developing Ruby on Rails applications"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/"
 SRC_URI="https://github.com/tpope/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim"
 KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/recover/recover-0.18.ebuild b/app-vim/recover/recover-0.18.ebuild
index 38cfca9c21eb..7512b666fb1b 100644
--- a/app-vim/recover/recover-0.18.ebuild
+++ b/app-vim/recover/recover-0.18.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: show differences for recovered files"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3068 https://github.com/chrisbra/Recover.vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3068 https://github.com/chrisbra/Recover.vim"
 LICENSE="vim"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/repeat/repeat-1.1.ebuild b/app-vim/repeat/repeat-1.1.ebuild
index be184379eb33..c2506991860e 100644
--- a/app-vim/repeat/repeat-1.1.ebuild
+++ b/app-vim/repeat/repeat-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ MY_PN="vim-repeat"
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="vim plugin: use the repeat command \".\" with plugin maps"
-HOMEPAGE="https://github.com/tpope/vim-repeat/ http://www.vim.org/scripts/script.php?script_id=2136"
+HOMEPAGE="https://github.com/tpope/vim-repeat/ https://www.vim.org/scripts/script.php?script_id=2136"
 SRC_URI="https://github.com/tpope/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim"
 KEYWORDS="amd64 x86"
diff --git a/app-vim/screen/screen-1.5.ebuild b/app-vim/screen/screen-1.5.ebuild
index 91c7caf1216a..f2a15aa2def7 100644
--- a/app-vim/screen/screen-1.5.ebuild
+++ b/app-vim/screen/screen-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit vim-plugin vcs-snapshot
 
 MY_PN="Screen-vim---gnu-screentmux"
 DESCRIPTION="vim plugin: simulate a split shell with screen or tmux"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2711"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2711"
 SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
 LICENSE="public-domain"
 KEYWORDS="amd64 x86"
diff --git a/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild b/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
index c6be88ee3e9a..de6531885534 100644
--- a/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
+++ b/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: tab completion in searches"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=474"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=474"
 LICENSE="GPL-2"
 KEYWORDS="alpha sparc x86 ia64 ppc amd64"
 IUSE=""
diff --git a/app-vim/securemodelines/securemodelines-20140926.ebuild b/app-vim/securemodelines/securemodelines-20140926.ebuild
index 7a1cf507ab1b..1027ea74755f 100644
--- a/app-vim/securemodelines/securemodelines-20140926.ebuild
+++ b/app-vim/securemodelines/securemodelines-20140926.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: secure, user-configurable modeline support"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines"
 LICENSE="vim"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
diff --git a/app-vim/showmarks/showmarks-2.2-r1.ebuild b/app-vim/showmarks/showmarks-2.2-r1.ebuild
index 58f2af5d082b..a28e80f254c9 100644
--- a/app-vim/showmarks/showmarks-2.2-r1.ebuild
+++ b/app-vim/showmarks/showmarks-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: show location marks visually"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=152"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=152"
 
 LICENSE="public-domain"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
diff --git a/app-vim/sleuth/sleuth-1.0.ebuild b/app-vim/sleuth/sleuth-1.0.ebuild
index 92063a0ff051..fa42aff92d2b 100644
--- a/app-vim/sleuth/sleuth-1.0.ebuild
+++ b/app-vim/sleuth/sleuth-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: heuristically set buffer options"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
 LICENSE="vim"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/app-vim/sleuth/sleuth-1.1.ebuild b/app-vim/sleuth/sleuth-1.1.ebuild
index ced2fffe99bd..f3ba9c8c9560 100644
--- a/app-vim/sleuth/sleuth-1.1.ebuild
+++ b/app-vim/sleuth/sleuth-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: heuristically set buffer options"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
 LICENSE="vim"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/slimv/slimv-0.9.12-r1.ebuild b/app-vim/slimv/slimv-0.9.12-r1.ebuild
index 5fe714d6934f..1d601bfbaeef 100644
--- a/app-vim/slimv/slimv-0.9.12-r1.ebuild
+++ b/app-vim/slimv/slimv-0.9.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-single-r1 vim-plugin vcs-snapshot
 
 DESCRIPTION="vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2531"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv"
 SRC_URI="https://bitbucket.org/kovisoft/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 LICENSE="public-domain"
 KEYWORDS="amd64 x86"
diff --git a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild b/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
index 78e20a7742e7..9f4e50a10ec2 100644
--- a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
+++ b/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 vim-plugin vcs-snapshot
 COMMIT="acf9b30be71c54db4f4875d257b905941ca69ed8"
 
 DESCRIPTION="vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL"
-HOMEPAGE="https://github.com/kovisoft/slimv"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv"
 SRC_URI="https://github.com/kovisoft/slimv/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/snipmate/snipmate-0.87-r1.ebuild b/app-vim/snipmate/snipmate-0.87-r1.ebuild
index 1f8c411b3d58..4397b174c5a4 100644
--- a/app-vim/snipmate/snipmate-0.87-r1.ebuild
+++ b/app-vim/snipmate/snipmate-0.87-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ MY_PN=vim-${PN}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="vim plugin: TextMate-style snippets"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2540 https://github.com/garbas/vim-snipmate"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2540 https://github.com/garbas/vim-snipmate"
 SRC_URI="https://github.com/garbas/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 KEYWORDS="amd64 x86"
diff --git a/app-vim/sudoedit/sudoedit-0.21.ebuild b/app-vim/sudoedit/sudoedit-0.21.ebuild
index 10390e571456..c2dac75eec6a 100644
--- a/app-vim/sudoedit/sudoedit-0.21.ebuild
+++ b/app-vim/sudoedit/sudoedit-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: edit files using sudo or su"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2709 https://github.com/chrisbra/SudoEdit.vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2709 https://github.com/chrisbra/SudoEdit.vim"
 LICENSE="vim"
 KEYWORDS="amd64 x86"
 VIM_PLUGIN_HELPFILES="SudoEdit.txt"
diff --git a/app-vim/supertab/supertab-2.1.ebuild b/app-vim/supertab/supertab-2.1.ebuild
index e08cfd3791d0..6e48c8901b53 100644
--- a/app-vim/supertab/supertab-2.1.ebuild
+++ b/app-vim/supertab/supertab-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: enhanced Tab key functionality"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1643 https://github.com/ervandew/supertab/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1643 https://github.com/ervandew/supertab/"
 SRC_URI="https://github.com/ervandew/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 ~mips ppc x86"
diff --git a/app-vim/surround/surround-2.1-r1.ebuild b/app-vim/surround/surround-2.1-r1.ebuild
index 6494ee32900c..c74a7ec85aeb 100644
--- a/app-vim/surround/surround-2.1-r1.ebuild
+++ b/app-vim/surround/surround-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: Delete/change/add parentheses/quotes/XML-tags & much more"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1697"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1697"
 LICENSE="vim"
 KEYWORDS="amd64 x86"
 
diff --git a/app-vim/syntastic/syntastic-3.8.0.ebuild b/app-vim/syntastic/syntastic-3.8.0.ebuild
index 36f8e62d1ec5..2c2f54a9780a 100644
--- a/app-vim/syntastic/syntastic-3.8.0.ebuild
+++ b/app-vim/syntastic/syntastic-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: syntax checking using external tools"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/"
 LICENSE="WTFPL-2"
 
 VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/syntastic/syntastic-9999.ebuild b/app-vim/syntastic/syntastic-9999.ebuild
index cc6fc347a77a..6776db4e00ef 100644
--- a/app-vim/syntastic/syntastic-9999.ebuild
+++ b/app-vim/syntastic/syntastic-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="vim plugin: syntax checking using external tools"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/"
 LICENSE="WTFPL-2"
 
 VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 13d85c3756c1..229171a4364b 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild
index 90b59dbad415..01cac92bcd44 100644
--- a/dev-ada/langkit/langkit-2017.ebuild
+++ b/dev-ada/langkit/langkit-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-ada/libadalang/libadalang-2017.ebuild b/dev-ada/libadalang/libadalang-2017.ebuild
index 30ee55045318..39c4eae6b6f9 100644
--- a/dev-ada/libadalang/libadalang-2017.ebuild
+++ b/dev-ada/libadalang/libadalang-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042
 
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-python/pyyaml
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 94ac757bdfd7..8d94be66a1f9 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.9.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.9.ebuild
index c18eb722b773..fc4d5f95ea80 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.9.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/s
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	app-arch/lz4:0=
diff --git a/dev-db/postgresql/postgresql-10.3.ebuild b/dev-db/postgresql/postgresql-10.3.ebuild
index 3606fab49166..ce92f347e3cd 100644
--- a/dev-db/postgresql/postgresql-10.3.ebuild
+++ b/dev-db/postgresql/postgresql-10.3.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 ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-9.3.22.ebuild b/dev-db/postgresql/postgresql-9.3.22.ebuild
index 08f19cc0a961..b6376e971b38 100644
--- a/dev-db/postgresql/postgresql-9.3.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.22.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 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.17.ebuild b/dev-db/postgresql/postgresql-9.4.17.ebuild
index a1248b747bfe..0038c8a5212b 100644
--- a/dev-db/postgresql/postgresql-9.4.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.17.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 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.12.ebuild b/dev-db/postgresql/postgresql-9.5.12.ebuild
index b00eaaaff86f..cbd281a4951b 100644
--- a/dev-db/postgresql/postgresql-9.5.12.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.12.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 ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.6.8.ebuild b/dev-db/postgresql/postgresql-9.6.8.ebuild
index 7cdd558e3a61..5c78dbed572e 100644
--- a/dev-db/postgresql/postgresql-9.6.8.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.8.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 ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
index 007a894e64bf..92543b70804c 100644
--- a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index ce5a2af5cbeb..293026655d72 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
index f50145111180..fa98c6bb2e37 100644
--- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="amd64 ~hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 x86"
 IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg
 jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
 truetype vnc wxwidgets xine xrandr zlib"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index b43c612980d8..3b4a70e0fe69 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/nim/nim-0.18.0.ebuild b/dev-lang/nim/nim-0.18.0.ebuild
index 0f55aec38568..53766c3e8a09 100644
--- a/dev-lang/nim/nim-0.18.0.ebuild
+++ b/dev-lang/nim/nim-0.18.0.ebuild
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc +readline test"
 
+RESTRICT=test # need to sort out depends and numerous failures
+
 RDEPEND="
 	readline? ( sys-libs/readline:0= )
 "
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 65a76b0dbd2e..bc17f39e1595 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -10,5 +10,6 @@ DIST swipl-7.6.1.tar.gz 16764536 BLAKE2B a493b103d9d6206db5a6c895ec1ff6237a122dd
 DIST swipl-7.6.2.tar.gz 16765119 BLAKE2B 242d093d7525aa9beeab28ca5cd10080490a93ecc18b62ff945b9d59266aa8bc31a66065b1742b76f336ee5af33994a3c41b0009665f2e29d83efa03fc5d3041 SHA512 9d93cdf44bbb9628cee42eae562ee945202ed0d454f9e433247a0b9b49eee070d3a76f7ceff002c4d13d15720e40e6860adc19581906b8b8ecaac3094192ab5a
 DIST swipl-7.6.3.tar.gz 16772590 BLAKE2B 644be801e290ec9d949a9b7462256a35e11cf9afd62d0b62c315e3620a3943809f58698a23f279454e00299f7b7f7b91e8d9694a139e8c424cb2f83a4efc7a52 SHA512 d84af1a565935af9934c6b75192bb2dd87388ee8fe793ade35d5549a95ec5eb83da6b10508766e795f88393fededea4ec7a3a0c2f0f685d96ab615e171d7d1f4
 DIST swipl-7.6.4.tar.gz 16777875 BLAKE2B 94409966362e649f4748b94b4ec25415bb827c7742aa39453d8e37db4ce992a65ad2d054ded4e651f2a9abe3a9438285bc9c9c895437c087ae6cf88f4afae9ca SHA512 f0ed16e4f1436115651c38a0bb37008d0dadad5a19b0f09894fcfc51dd3d429f86488e89cce00788c3c36cc2f0cd2957f92df47d5441133a6f8ea9d91ca5470f
+DIST swipl-7.7.10.tar.gz 16800970 BLAKE2B c9d8904734bb5a6d20adad8203cec6682e9bd97a343d887d1c03dfb735f32e5794ab0631a76e69fe5f0c7d2e76cd21be06471c7df6e4bc585882b7de1308ec70 SHA512 55e0b129424c2ba0f7a8151b85eaf3de6ce7e16ed01626fae245eb0ee754dcfa7bfbd3a30d00da7e2df72b8d2899e5354900e27b47ffe0401bc26a0b594f9d30
 DIST swipl-7.7.8.tar.gz 16791278 BLAKE2B 6a2f27c02c5f2a4247b44961eb438e579be901a8badac3cf238adb63fdd1b13bf2400993bac1af1e509476b40b158a0aa6d66e4e0440eb67f745a33580266b47 SHA512 007b683d56d1ee3d5f5637819879141bae9d5a8738a613ed93a3a62a7a43674de39d0e1a3c1f6112fd6f9ab998e5f4bfed8b1abba7d95ceec16eaba73a627dee
 DIST swipl-7.7.9.tar.gz 16794383 BLAKE2B edb99cd235529de319557d9126e459b5c7586517bcafd6e9a8125a4acf0fea1252a4506eae359604156c57af05c1924b9de2e2a3e79573f7e446e014ae55e1c6 SHA512 d93f0a97c4710ff396514f9bbf45dd09faddf3db528563f65cf0a93ae0a8400c603cb13d0707dbf70ffb62f0c981e6823c3c6487c1d5600620fd551c877f6b01
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild
new file mode 100644
index 000000000000..b3c8e67bc2e8
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.7:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with libedit) \
+			$(use_with pcre) \
+			$(use_with odbc) \
+			$(use_with readline) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7e3ba16f3419..11e1f1ce5f33 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index 95092d080dc6..c3f83128332b 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,8 +26,8 @@ else
 fi
 
 COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
-	sys-devel/clang:=[${MULTILIB_USEDEP}]
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/clang-6.0.0:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-6.0.0:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/boost/boost-1.65.0.ebuild b/dev-libs/boost/boost-1.65.0.ebuild
index f32fadeba8ff..7a01d500db6e 100644
--- a/dev-libs/boost/boost-1.65.0.ebuild
+++ b/dev-libs/boost/boost-1.65.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-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 ~sparc64-solaris ~x86-solaris ~x86-winnt"
+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 ~sparc64-solaris ~x86-solaris ~x86-winnt"
 
 IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
 
diff --git a/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild
index df4a632e1cd3..73cf4990af28 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 RDEPEND="
diff --git a/dev-libs/icu/icu-60.2.ebuild b/dev-libs/icu/icu-60.2.ebuild
index ec5c4e6b8cc1..c483c33dd5df 100644
--- a/dev-libs/icu/icu-60.2.ebuild
+++ b/dev-libs/icu/icu-60.2.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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/leatherman/leatherman-1.4.0.ebuild b/dev-libs/leatherman/leatherman-1.4.0.ebuild
index 1bbc1551d010..41db96ea9c04 100644
--- a/dev-libs/leatherman/leatherman-1.4.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/1.4"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index b65ec03c4bc1..4506225bcf17 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,2 +1,3 @@
 DIST libgit2-0.26.0.tar.gz 4697149 BLAKE2B 468e679bd7093004fb19a7947102d09bb90c653f3957615ce5468fe4c602f61804877072445a90447d83c70277529d02762cd3f35d0879708ea8355c44fe3456 SHA512 988c616c99637f2c1f80c498de34820296b78c0601669475eba9d194490cfd2047131987e63a799599277893e5741f9bcc226ffa594327356047ed563f07d346
 DIST libgit2-0.26.2.tar.gz 4706513 BLAKE2B e11a7043d3f1b0a13d04129b7052d60beb401bc87f583f63dc514251dda001b622d8a7b5c7b65b8d6364244e4b15e09bd4ef789b120ef13214cd0430af8c76c1 SHA512 4601b4a09f2c70b41361eab5549d3f758ab5a62742e4ae0b07df0cf4f8d7b66a2eae09a1db410afcce0f6436162dbc4f8cbe97b08de1807960ddfce02e5d695b
+DIST libgit2-0.26.3.tar.gz 4728289 BLAKE2B b437732cb30d85487a7a1a16efd41d19fe7677635ae07393094cd2931a0fb6673f41b14122793a31dd317e27936df9844fcb2444ba916469e4673f42e9db04f6 SHA512 abcd3a904bed05c1f200be2ffbc2c44cebd1b548459ee834d5635c5eaf7bcd551a4993bcc1cb9fbeae9ea990c5ebc07655007ff4e623fa7c697f326c0ce12c3e
diff --git a/dev-libs/libgit2/libgit2-0.26.3.ebuild b/dev-libs/libgit2/libgit2-0.26.3.ebuild
new file mode 100644
index 000000000000..549b491f6136
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.26.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/26"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	curl? (
+		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+	)
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_prepare() {
+	# skip online tests
+	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DCURL=$(usex curl)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index 899540f73af0..677c3a9a8184 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -18,13 +18,17 @@ HOMEPAGE="https://libgit2.github.com/"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/26"
-IUSE="examples gssapi libressl +ssh test +threads trace"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	sys-libs/zlib
 	net-libs/http-parser:=
+	curl? (
+		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+	)
 	gssapi? ( virtual/krb5 )
 	ssh? ( net-libs/libssh2 )
 "
@@ -36,7 +40,7 @@ DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
 
 src_prepare() {
 	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
+	sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die
 
 	cmake-utils_src_prepare
 }
@@ -44,11 +48,12 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use_build test CLAR)
-		$(cmake-utils_use_enable trace TRACE)
-		$(cmake-utils_use_use gssapi GSSAPI)
-		$(cmake-utils_use_use ssh SSH)
-		$(cmake-utils_use threads THREADSAFE)
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DCURL=$(usex curl)
 	)
 	cmake-utils_src_configure
 }
@@ -68,7 +73,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples ; then
-		egit_clean examples
+		find examples -name '.gitignore' -delete || die
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/dev-libs/libgit2/metadata.xml b/dev-libs/libgit2/metadata.xml
index 341b4d4cf6d8..e090ecb97fe2 100644
--- a/dev-libs/libgit2/metadata.xml
+++ b/dev-libs/libgit2/metadata.xml
@@ -15,6 +15,8 @@
 		speed custom Git applications in any language which supports C bindings.
 	</longdescription>
 	<use>
+		<flag name="curl">Use <pkg>net-misc/curl</pkg> for HTTP support
+			(otherwise, limited built-in implementation will be used)</flag>
 		<flag name="gssapi">Enable GSSAPI support for SPNEGO auth</flag>
 		<flag name="ssh">Enable SSH transport support</flag>
 		<flag name="trace">Enable tracing support</flag>
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
index 48262435f8ed..7491fa987566 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="libressl ssl"
 
 RDEPEND="ssl? (
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 64ea52e2031b..b4e24ae9e135 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch b/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch
new file mode 100644
index 000000000000..e23f1e6d9bcb
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch
@@ -0,0 +1,16 @@
+diff -r -U2 sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux sbcl-1.3.11/src/runtime/Config.x86-64-linux
+--- sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux	2016-10-30 23:28:43.000000000 +0700
++++ sbcl-1.3.11/src/runtime/Config.x86-64-linux	2016-11-16 23:27:37.248815622 +0700
+@@ -58,12 +58,4 @@
+ endif
+ 
+-# The following works for Ubuntu 16.10. There must be a better way to
+-# do this across various flavors of linux.
+-ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),)
+-CFLAGS += -fno-pie
+-LINKFLAGS += -no-pie
+-LDFLAGS += -no-pie
+-endif
+-
+ # Nothing to do for after-grovel-headers.
+ .PHONY: after-grovel-headers
diff --git a/dev-lisp/sbcl/files/sbcl-1.3.13-config.patch b/dev-lisp/sbcl/files/sbcl-1.3.13-config.patch
deleted file mode 100644
index e20fc07b028d..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.3.13-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -r -U2 sbcl-1.3.13.orig/src/runtime/Config.x86-64-linux sbcl-1.3.13/src/runtime/Config.x86-64-linux
---- sbcl-1.3.13.orig/src/runtime/Config.x86-64-linux	2016-12-31 09:38:30.000000000 +0100
-+++ sbcl-1.3.13/src/runtime/Config.x86-64-linux	2017-02-05 16:11:54.801938872 +0100
-@@ -58,12 +58,4 @@
- endif
- 
--# The following works for Ubuntu 16.10. There must be a better way to
--# do this across various flavors of linux.
--ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),)
--CFLAGS += -fno-pie
--LINKFLAGS += -no-pie
--LDFLAGS += -no-pie
--endif
--
- # Nothing to do for after-grovel-headers.
- .PHONY: after-grovel-headers
-diff -r -U2 sbcl-1.3.13.orig/src/runtime/Config.x86-linux sbcl-1.3.13/src/runtime/Config.x86-linux
---- sbcl-1.3.13.orig/src/runtime/Config.x86-linux	2016-12-31 09:38:30.000000000 +0100
-+++ sbcl-1.3.13/src/runtime/Config.x86-linux	2017-02-05 16:10:16.882945480 +0100
-@@ -50,12 +50,4 @@
- endif
- 
--# The following works for Ubuntu 16.10. There must be a better way to
--# do this across various flavors of linux.
--ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),)
--CFLAGS += -fno-pie
--LINKFLAGS += -no-pie
--LDFLAGS += -no-pie
--endif
--
- GC_SRC = gencgc.c
- 
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 145e2b623f22..de1ddfac0c2a 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.0.ebuild
index 6e89dac5c076..0e64a225bb7b 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-6.0.0.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-6.0.0.ebuild
@@ -23,7 +23,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.100.ebuild b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.100.ebuild
deleted file mode 100644
index e2690b890984..000000000000
--- a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.100.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MONSIEURP
-DIST_VERSION=0.100100
-
-inherit perl-module
-
-DESCRIPTION="Utility to merge PRs from the Gentoo Github repository"
-HOMEPAGE="https://github.com/monsieurp/Gentoo-App-Pram"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
-IUSE="test"
-
-RDEPEND="
-	dev-vcs/git
-	virtual/perl-Encode
-	dev-perl/File-Which
-	virtual/perl-File-Temp
-	virtual/perl-HTTP-Tiny
-	virtual/perl-Getopt-Long
-	virtual/perl-Term-ANSIColor
-	>=dev-perl/Net-SSLeay-1.490.0
-	>=dev-perl/IO-Socket-SSL-1.560.0"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.34.0
-	test? (
-		>=virtual/perl-Test-Simple-0.890.0
-	)"
diff --git a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.200.ebuild b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.200.ebuild
index 107fa6ff1fb4..a4a374c5f697 100644
--- a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.200.ebuild
+++ b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.100.200.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Utility to merge PRs from the Gentoo Github repository"
 HOMEPAGE="https://github.com/monsieurp/Gentoo-App-Pram"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Gentoo-App-Pram/Manifest b/dev-perl/Gentoo-App-Pram/Manifest
index 5c36d52df3ca..1bc2bb1f54c5 100644
--- a/dev-perl/Gentoo-App-Pram/Manifest
+++ b/dev-perl/Gentoo-App-Pram/Manifest
@@ -1,2 +1 @@
-DIST Gentoo-App-Pram-0.100100.tar.gz 12919 BLAKE2B d7c414c7010723017255931de95d76483c31a30efbc31fb5b9b01435201a16ad3c0c859f85ef425555f78d370d4b36572586123305391f4084c5bcfaf8975d42 SHA512 8a2c16610dc00b56d1ef61f17fbdee053c4cceedb6dd23d99ffb83220873870ce97398f3d1522c5f1210a6928381c401bb08a7c18192bcc8c48a3ded037a4140
 DIST Gentoo-App-Pram-0.100200.tar.gz 12893 BLAKE2B e88903f941c72607d7e367231f7c4c8f4bb58cde85c43f7a8c3f3a8b4a058313b08cabdaeee972d0fca3c56839d5cc34f001d86fe5002461712faac3bfba21d8 SHA512 e2f452b187005dc4ba8d98db9cd9257e6c9a90dbaa0c83c19698b996f5cac273529f6ac98c4d1bde0a3e8401389ba6703cf8c3525b65ed7494b1a986f15cd492
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 6dd26f264dc5..1ad33c50d59f 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Plack/Manifest b/dev-perl/Plack/Manifest
index 3a71d20c05f1..90b0075dbab7 100644
--- a/dev-perl/Plack/Manifest
+++ b/dev-perl/Plack/Manifest
@@ -1,3 +1 @@
-DIST Plack-1.0039.tar.gz 176711 BLAKE2B e34d7b3ad5a13f1a9f9ea8ca0b660c6613d478d2186681d4b3d74dad75a88cfeed7901d725dda45a01fafc1d40c2e11b3ae8c9b91b3ffebc2b2d04c227a43ef3 SHA512 963e30ec721a96f99ac9524b1b38861965aa84878062551ae77e62c7b2724cf00d6e7e265dde1c88f3e1aa3da7ca41bb5a392e990409380de09c1c1b769b5387
-DIST Plack-1.0043.tar.gz 178508 BLAKE2B 2a4eff44b2b3a9429c6824876cf4b22edc72a627552bd2291176248325540ce9e111b886072f34d05de8d338fade6806b556e07f9d3ebd1e30b363357bad3086 SHA512 b77f7f1a2a3d2b24f5473af55448ac72d287f34671c9300dc94d5d315aaac9040ec98d498319cfb3877e1cda53f9850ff4548dc46702d722491ad7034d439104
 DIST Plack-1.0044.tar.gz 178730 BLAKE2B 60f6a900b1ebf05c48295ae679e7cda905441d4322929e9280aa87e6fda51a08e3fbaef37e2398fcfef3b39268f115603dcec2529dd135ddc86b79c9118da0c8 SHA512 a0dae77d507d4b4cf4192931470cf87f68f7027b2057ccdf757680f9e6584534ee0da79c508a44f9ea72426497e1dbbdb7acf6d7dfdf31698f4320f2c1f2ac61
diff --git a/dev-perl/Plack/Plack-1.3.900.ebuild b/dev-perl/Plack/Plack-1.3.900.ebuild
deleted file mode 100644
index 3556fb3d60e4..000000000000
--- a/dev-perl/Plack/Plack-1.3.900.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MIYAGAWA
-DIST_VERSION=1.0039
-inherit perl-module
-
-DESCRIPTION="Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test minimal examples"
-PATCHES=(
-	"${FILESDIR}/${P}-issue-545.patch"
-	"${FILESDIR}/${P}-network-testing.patch"
-)
-RDEPEND="
-	!minimal? (
-		dev-perl/CGI-Compile
-		dev-perl/CGI-Emulate-PSGI
-		dev-perl/FCGI
-		dev-perl/FCGI-ProcManager
-		>=dev-perl/libwww-perl-5.814.0
-	)
-	>=dev-perl/Apache-LogFormat-Compiler-0.120.0
-	>=dev-perl/Cookie-Baker-0.50.0
-	>=dev-perl/Devel-StackTrace-1.230.0
-	>=dev-perl/Devel-StackTrace-AsHTML-0.110.0
-	>=dev-perl/File-ShareDir-1.0.0
-	dev-perl/Filesys-Notify-Simple
-	>=dev-perl/HTTP-Body-1.60.0
-	>=dev-perl/HTTP-Headers-Fast-0.180.0
-	>=dev-perl/HTTP-Message-5.814.0
-	>=virtual/perl-HTTP-Tiny-0.34.0
-	>=dev-perl/Hash-MultiValue-0.50.0
-	>=virtual/perl-Pod-Parser-1.360.0
-	>=dev-perl/Stream-Buffered-0.20.0
-	>=dev-perl/Test-TCP-2.0.0
-	dev-perl/Try-Tiny
-	>=dev-perl/URI-1.590.0
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/File-ShareDir-Install-0.60.0
-	test? (
-		!minimal? (
-			dev-perl/Authen-Simple-Passwd
-			dev-perl/HTTP-Request-AsCGI
-			dev-perl/HTTP-Server-Simple-PSGI
-			dev-perl/IO-Handle-Util
-			dev-perl/Log-Dispatch
-			dev-perl/Log-Dispatch-Array
-			dev-perl/Log-Log4perl
-			dev-perl/LWP-Protocol-http10
-			dev-perl/MIME-Types
-			dev-perl/Module-Refresh
-		)
-		dev-perl/Test-Requires
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
-src_test() {
-	perl_rm_files "t/author-pod-syntax.t"
-	perl-module_src_test
-}
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples/
-		dodoc -r eg/dot-psgi/*
-	fi
-}
diff --git a/dev-perl/Plack/Plack-1.4.300.ebuild b/dev-perl/Plack/Plack-1.4.300.ebuild
deleted file mode 100644
index e6ec85ba0044..000000000000
--- a/dev-perl/Plack/Plack-1.4.300.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MIYAGAWA
-DIST_VERSION=1.0043
-DIST_EXAMPLES=("eg/dot-psgi/*")
-inherit perl-module
-
-DESCRIPTION="Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test minimal examples"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.900-network-testing.patch"
-)
-RDEPEND="
-	!minimal? (
-		dev-perl/CGI-Compile
-		dev-perl/CGI-Emulate-PSGI
-		dev-perl/FCGI
-		dev-perl/FCGI-ProcManager
-		>=dev-perl/libwww-perl-5.814.0
-		>=dev-perl/Log-Dispatch-2.250.0
-		dev-perl/Log-Log4perl
-		dev-perl/Module-Refresh
-	)
-	>=dev-perl/Apache-LogFormat-Compiler-0.330.0
-	>=dev-perl/Cookie-Baker-0.70.0
-	>=dev-perl/Devel-StackTrace-1.230.0
-	>=dev-perl/Devel-StackTrace-AsHTML-0.110.0
-	>=dev-perl/File-ShareDir-1.0.0
-	dev-perl/Filesys-Notify-Simple
-	>=dev-perl/HTTP-Entity-Parser-0.170.0
-	>=dev-perl/HTTP-Headers-Fast-0.180.0
-	>=dev-perl/HTTP-Message-5.814.0
-	>=virtual/perl-HTTP-Tiny-0.34.0
-	>=dev-perl/Hash-MultiValue-0.50.0
-	>=virtual/perl-Pod-Parser-1.360.0
-	>=dev-perl/Stream-Buffered-0.20.0
-	>=dev-perl/Test-TCP-2.0.0
-	dev-perl/Try-Tiny
-	>=dev-perl/URI-1.590.0
-	>=dev-perl/WWW-Form-UrlEncoded-0.230.0
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/File-ShareDir-Install-0.60.0
-	test? (
-		!minimal? (
-			dev-perl/Authen-Simple-Passwd
-			dev-perl/HTTP-Request-AsCGI
-			dev-perl/HTTP-Server-Simple-PSGI
-			dev-perl/Log-Dispatch-Array
-			dev-perl/LWP-Protocol-http10
-			dev-perl/MIME-Types
-			>=dev-perl/Test-MockTime-HiRes-0.60.0
-		)
-		dev-perl/Test-Requires
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
-src_test() {
-	perl_rm_files "t/author-pod-syntax.t"
-	perl-module_src_test
-}
diff --git a/dev-perl/Set-Object/Manifest b/dev-perl/Set-Object/Manifest
index 89141190236a..9feedbee3cc7 100644
--- a/dev-perl/Set-Object/Manifest
+++ b/dev-perl/Set-Object/Manifest
@@ -1,2 +1 @@
-DIST Set-Object-1.35.tar.gz 79370 BLAKE2B d7e9f95c9b02335bf29104456b69f08723bcdd8ef86e8af2435779ecaf705c082640087272206242c44e0aa0db48e6f2a6bca169bf8f8f1738592a828f26acc8 SHA512 5b915d77772dd3146e89ea8448a178b3faa6fe044a9df1d4aa217afa228df26367faa2d073fe9b6886cbc0a9075ab8ac46ebaf884624aa82be575fd89279d6a7
 DIST Set-Object-1.38.tar.gz 80719 BLAKE2B ff7a42a2fd1f368d58bbc73bf10ea3579c952b49a826e47ac9e7ea3c64a792117fd55b2f52979c51ec8964f2abd9c0f5c2f05211e0c7a407e7f37e91ab3486f7 SHA512 fa0411f543fe1837d7c07a07a99d3b8a3735162fb7b665060870cec8edd40ab39eed74791ce2aa96b9ca04a8e773d810ba979508b03f8d4698e8d844f62bee1a
diff --git a/dev-perl/Set-Object/Set-Object-1.350.0.ebuild b/dev-perl/Set-Object/Set-Object-1.350.0.ebuild
deleted file mode 100644
index 638412859cd2..000000000000
--- a/dev-perl/Set-Object/Set-Object-1.350.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RURBAN
-MODULE_VERSION=1.35
-inherit perl-module
-
-DESCRIPTION="set of objects and strings"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/ShipIt/ShipIt-0.600.0.ebuild b/dev-perl/ShipIt/ShipIt-0.600.0.ebuild
deleted file mode 100644
index 1e6d7c9ef34e..000000000000
--- a/dev-perl/ShipIt/ShipIt-0.600.0.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
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=0.60
-inherit perl-module
-
-DESCRIPTION="Software Release Tool"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-SRC_TEST="do"
-
-pkg_postinst() {
-	elog "Please note that ShipIt does not depend on any specific VCS."
-	elog "You must install a supported VCS (CVS, SVN, SVK, GIT, HG) for use."
-}
diff --git a/dev-perl/Term-ReadLine-TTYtter/Term-ReadLine-TTYtter-1.4.ebuild b/dev-perl/Term-ReadLine-TTYtter/Term-ReadLine-TTYtter-1.4.ebuild
deleted file mode 100644
index 577519f12961..000000000000
--- a/dev-perl/Term-ReadLine-TTYtter/Term-ReadLine-TTYtter-1.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CKAISER
-MODULE_VERSION=1.4
-
-inherit perl-module
-
-DESCRIPTION="Quick implementation of readline utilities for ttytter"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/TermReadKey"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Text-Diff/Manifest b/dev-perl/Text-Diff/Manifest
index 43b2b6780566..1fb7c5468157 100644
--- a/dev-perl/Text-Diff/Manifest
+++ b/dev-perl/Text-Diff/Manifest
@@ -1,3 +1,4 @@
 DIST Text-Diff-1.41.tar.gz 27813 BLAKE2B e1131e560c33f9207e6bbb1b63bea01408a1062b4154fbb1cecf75aac6f55aa0e4b91cfd5221b6d512fd2f54afc1ac007e88495c8d682c3b1f5fbab9b1297d17 SHA512 77ebd2fff53e5a347d75f50134332b1bb9843f44ecf82872919bc407abacc25446a98346f38425807a9cb8bf2d380d31f12aa9f3c6b2049d4383099920ee9a34
 DIST Text-Diff-1.43.tar.gz 29330 BLAKE2B 2747cdf71b3943637eac10531ab7eb1dacaeed0dd07c73d7849ad8842ab3a0c213b844b3e8813c6846a04c7ee7a39987b8bd92f5a522dd50e465250204f40a05 SHA512 c76eee797d6b198016af69008186af906f3d6c83b7c9e29c95bcf38c2539588f991cc2eb44b34b3701ceee879ae37c73a8fba0240f6e9a462b9be581942e5842
 DIST Text-Diff-1.44.tar.gz 29535 BLAKE2B f496cdc63ae8c355ef1158b2cba8e9a08b577f5c2245006ee506bcfaaf519ad2d8d5c0293fe6c036f562a40d2bf0021001a2a99da54e98eb6d71735926aeeae5 SHA512 6174135a07c880cb92577ad07107a4d4606f91a2602f65d9c0fd032d11de86d91367feb6e2da71f9b9293331460ab42439623c5c03e2ee4807846709c3e964aa
+DIST Text-Diff-1.45.tar.gz 29599 BLAKE2B 361bc0a8fd7bcbd67df75d59e4c360f9982ce89807080150bfff535218ea9be814d41120710a4880bf777a639bf1b8ca0bd2d9f9182a1a2bec17401955fb1a36 SHA512 569370707bf30d60d12df6389594bcdba050805005916ac3a485c2226e528891b0af9ecfcc13d20e4f377d2c36a7ff67e51de5ca409c647aa8a36b7a87eab367
diff --git a/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild b/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild
new file mode 100644
index 000000000000..c587bb63a168
--- /dev/null
+++ b/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NEILB
+DIST_VERSION=1.45
+inherit perl-module
+
+DESCRIPTION="Perform diffs on files and record sets"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/Algorithm-Diff-1.190.0
+	virtual/perl-Exporter
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+PERL_RM_FILES=( "t/97_meta.t" "t/98_pod.t" "t/99_pmv.t" )
diff --git a/dev-perl/Text-Format/Manifest b/dev-perl/Text-Format/Manifest
index e79834b9d714..2430bc1e158c 100644
--- a/dev-perl/Text-Format/Manifest
+++ b/dev-perl/Text-Format/Manifest
@@ -1 +1,2 @@
 DIST Text-Format-0.59.tar.gz 25850 BLAKE2B dd72bd14bead0c8294372060d9e72dc6dce5b321711ad7ca5f0cff5721ae28ede79d8a860ad3fa95289c4541319fc95541aad51ec7108cf2da1c8060301e4c41 SHA512 030fc38853f96d64f359af1ad9f776e7c797f564f11207de32477b3b716da665dbce3b91d988241ba1fbd2b884aa85b0ce0b7b473aaf0efd23839f8422a52fcd
+DIST Text-Format-0.60.tar.gz 25913 BLAKE2B 27e885dacfd0a1019633cd2c805f7d26ffdd62da2e281366fa87e331e47e5ef3e12c2d6a20b47ecaf0ea1e591aedfb7d92829ad21a80a8a3481d8688fd2516a5 SHA512 04330567c62854d7d6758e15e0a4ef3799ed15a0e66782f1080d20e62df33eaf2b44c3c126e64a6855ff2cbe28d86cbbaee2a845a287b21da0b81869edd1219f
diff --git a/dev-perl/Text-Format/Text-Format-0.600.0.ebuild b/dev-perl/Text-Format/Text-Format-0.600.0.ebuild
new file mode 100644
index 000000000000..47895f0b11c5
--- /dev/null
+++ b/dev-perl/Text-Format/Text-Format-0.600.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=0.60
+
+inherit perl-module
+
+DESCRIPTION="Various subroutines to format text"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+
+RDEPEND="virtual/perl-Carp"
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? ( virtual/perl-Test-Simple )
+"
+PERL_RM_FILES=( "t/pod-coverage.t" "t/cpan-changes.t" "t/pod.t" "t/style-trailing-space.t" )
diff --git a/dev-perl/Text-Glob/Manifest b/dev-perl/Text-Glob/Manifest
index b3c4d9b59d73..2887da84a44a 100644
--- a/dev-perl/Text-Glob/Manifest
+++ b/dev-perl/Text-Glob/Manifest
@@ -1 +1,2 @@
 DIST Text-Glob-0.09.tar.gz 4171 BLAKE2B 770e5f54fa7ce8ecbdf884e6823b2928b1826602657905be998dac9642e372dc809673a2fc5e4ab16ca08c9908f17ffca42fd44c71ec11de12ac157984986e44 SHA512 9b729e4ece88ad79e1b637c7f35e5e1ecae3fd7f62c408ed4f3fcac2e8e8afff32d7d805e1b0269800aada5ae609d03335d42ac54def2797d301e91fa488ae47
+DIST Text-Glob-0.11.tar.gz 4862 BLAKE2B d57c2f2cde24b8fedfe0e0bc17c4008c1107b07bb91fa62d95428100c80bc8dfebdcae2e16dd0768a88130d43a0461b6c5227bcd00607afcdb09606cdbb8db61 SHA512 20322fee3f56ee7e65f0f8e5371d9dbbe89895d8b9c9207486e7934e29bd883fb557c9765e406f85f56b67019293d82a0318ded83a9387b164cb5e8f58bef0cb
diff --git a/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild b/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild
new file mode 100644
index 000000000000..c8d47ebd82b7
--- /dev/null
+++ b/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RCLAMP
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Match globbing patterns against text"
+
+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"
+IUSE="test"
+
+RDEPEND="virtual/perl-Exporter"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Text-Table/Manifest b/dev-perl/Text-Table/Manifest
index b8a29c745c22..a0e9797472bc 100644
--- a/dev-perl/Text-Table/Manifest
+++ b/dev-perl/Text-Table/Manifest
@@ -1,2 +1,3 @@
 DIST Text-Table-1.130.tar.gz 28019 BLAKE2B 6c1dadf4e7643261f0bc0e6e3ffa8ca645570ff36ee374023697e511bd390c53e09e94b3deaaaebf9b7f6052264cb7db72d3ec2aaeb29804ea86db5d4e08743e SHA512 8e19b2713202efcf2c50e69547ac4673fdc108165c49fba1dd7143875282de9c33acfe2a9ce2f03f5d7d07b34178bbb0944c97637e09811aa3dc219f20e0c09f
 DIST Text-Table-1.132.tar.gz 27238 BLAKE2B 7e07e65f82a3bcba3f922932534824890bcd030c90523d22dfd7a3464a95ebf091f5f449c56dc5b114addee220ff83629bf7979fc9ea4d42abc7bbb422986f40 SHA512 456c531bb35e57ecee62952d7e1a0601d31595e2f674840cd964a66c89c5561e30e54f06bd301f3a5d136e5cf5f3aa50f66cbbf26aab61a6e14d2512999b5ce8
+DIST Text-Table-1.133.tar.gz 27178 BLAKE2B f9df055c62107af8410f6e9bc8cd1b6f5d0ab0d29386535c81b68d5a3e6ba5836e747be83931008dff0f750252bcd9d679af6354bee038ec720fb28070862aef SHA512 fc9ebcb7accc07ec66bc8157a679d3905b06dfcf21560641b149c5930e527385ea2be45190190319c73f6d184e3d4f4ce5deaccf3da58b91f45a820e86fea2ac
diff --git a/dev-perl/Text-Table/Text-Table-1.133.0.ebuild b/dev-perl/Text-Table/Text-Table-1.133.0.ebuild
new file mode 100644
index 000000000000..8f31c5a9e7c8
--- /dev/null
+++ b/dev-perl/Text-Table/Text-Table-1.133.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=1.133
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Organize Data in Tables"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Text-Aligner-0.50.0
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+	)
+"
+
+PERL_RM_FILES=( "t/author-pod-coverage.t" "t/author-pod-syntax.t" "t/release-cpan-changes.t" "t/style-trailing-space.t" )
diff --git a/dev-perl/Text-Template/Manifest b/dev-perl/Text-Template/Manifest
index e60ae89d9f1e..73bd27df4f4c 100644
--- a/dev-perl/Text-Template/Manifest
+++ b/dev-perl/Text-Template/Manifest
@@ -1,2 +1,3 @@
 DIST Text-Template-1.46.tar.gz 43952 BLAKE2B 6dff627f7924e0a84528687245da5b69ecaba8dbe26fd932e09b4486cc74743ae98e6874a0062566ae2339f6f2f1d7364c7cae292111b1c815c52ceddec30338 SHA512 406c218d5d59dc74419749fb5151d011fb4d629e6de79378be1290db23a602a9f7897f04ac80080b8ec2661d997f9e05bed7861e480130750471166da0a94592
 DIST Text-Template-1.47.tar.gz 48988 BLAKE2B a34bc1b4dc7e29f5171d9aa5da21d9083763701ba19ff9f50ca488f8a3936181fc17f7d8e517743fc77ac7e8f688aea33a802c949edfff3c61b79b7f272ca489 SHA512 af5ad3fc8191d2dd8609735b6a7d6221e4f7ec668c6bc35650081fee248cdc9676984302d420ac227baf8d2de6f6eb023e01f54290b90508e294ba4309b0e68e
+DIST Text-Template-1.51.tar.gz 48054 BLAKE2B ca44e383799624949a5fa05de288a86351422cf7e4efcdb7f1a98b16216443aa3e269f7e69eb134458e889250133aa81dd15922b8a20ab4bf83b92fc16ac82ed SHA512 038a810746684b26cd6a763cfb8adff57a2ed8dc57e44b170b6ba6c8271d513289546294439cfe1c8b77f40153751596a023079ee79bfc6b59fa9393cfcc04f4
diff --git a/dev-perl/Text-Template/Text-Template-1.510.0.ebuild b/dev-perl/Text-Template/Text-Template-1.510.0.ebuild
new file mode 100644
index 000000000000..c0addcea8b05
--- /dev/null
+++ b/dev-perl/Text-Template/Text-Template-1.510.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MSCHOUT
+DIST_VERSION=1.51
+inherit perl-module
+
+DESCRIPTION="Expand template text with embedded Perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86 ~ppc-macos"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Temp
+		virtual/perl-Safe
+		virtual/perl-Test-Simple
+		dev-perl/Test-Warnings
+	)
+"
+PERL_RM_FILES=( "t/author-pod-syntax.t" "t/author-signature.t" )
diff --git a/dev-perl/Tie-Cycle/Manifest b/dev-perl/Tie-Cycle/Manifest
index 30f29de78cce..d1e5ba9f23e4 100644
--- a/dev-perl/Tie-Cycle/Manifest
+++ b/dev-perl/Tie-Cycle/Manifest
@@ -1,2 +1,3 @@
 DIST Tie-Cycle-1.221.tar.gz 9741 BLAKE2B fffd64188d5a01be5a860577db18780b14da4fc40e5f295ab297a02e14e147440f1f498ec4e48426965a46366a8091dbaa40c71031a40fd058e2dc6c5db43798 SHA512 39ed261ef2e3a6a93cc63197966ccae6ddee2473c24241067223448badeb76509682c52043bb34299a27f2f3a35956d3022af2fb13bd331ed2cc132dbc703087
 DIST Tie-Cycle-1.224.tar.gz 11085 BLAKE2B 013a94581f98b8930abb96a9575c6b16db75b10e7da1fa88f38e70a5288c9df79c7bb0905faa3bfe410bb4f46db4b5eb1713064fc371fc9f74b1ecef73c40582 SHA512 291f012e85108809d75302bb6554beffdfbf3ec3153acef667d0dfa34a0309190f9211a19728620c1ff6bedfeff5fd9209d2d4589f13fba144d0c0fade53f9b6
+DIST Tie-Cycle-1.225.tar.gz 11109 BLAKE2B 8a1d2905988c33216932e6d88765afcf6f0dfa9ea42f4b3ce9146856a21aaad4931660066d52d18569171292c3175dfe1fd4fcc9dc1f43b42acf0d586122e946 SHA512 68822821a6bb5475bef7bfdb6775a876aaac6afead5b79b0bd1365f99eb1bf4430a5ae97b8e124f66fd4cbef2b4095df526c85d2d9240b0750bfae6af3c9f75e
diff --git a/dev-perl/Tie-Cycle/Tie-Cycle-1.225.0.ebuild b/dev-perl/Tie-Cycle/Tie-Cycle-1.225.0.ebuild
new file mode 100644
index 000000000000..7182487d4185
--- /dev/null
+++ b/dev-perl/Tie-Cycle/Tie-Cycle-1.225.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BDFOY
+DIST_VERSION=1.225
+inherit perl-module
+
+DESCRIPTION="Cycle through a list of values via a scalar"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}/${PN}-1.225-nopodtests.patch" )
+PERL_RM_FILES=( "t/pod.t" "t/pod_coverage.t" )
+RDEPEND="virtual/perl-Carp"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
+	virtual/perl-File-Spec
+	test? (
+		>=virtual/perl-Test-Simple-0.950.0
+	)
+"
diff --git a/dev-perl/Tie-Cycle/files/Tie-Cycle-1.225-nopodtests.patch b/dev-perl/Tie-Cycle/files/Tie-Cycle-1.225-nopodtests.patch
new file mode 100644
index 000000000000..f868add6b513
--- /dev/null
+++ b/dev-perl/Tie-Cycle/files/Tie-Cycle-1.225-nopodtests.patch
@@ -0,0 +1,27 @@
+From 9286e6f00bf63318dcc73380d48af497ba774ad9 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Tue, 19 Apr 2016 09:46:13 +1200
+Subject: Remove unwanted author tests
+
+---
+ MANIFEST         |  2 --
+ t/pod.t          |  4 ----
+ t/pod_coverage.t | 13 -------------
+ t/test_manifest  |  2 --
+ 4 files changed, 21 deletions(-)
+ delete mode 100644 t/pod.t
+ delete mode 100644 t/pod_coverage.t
+
+diff --git a/t/test_manifest b/t/test_manifest
+index 31cb5b3..e2602b0 100644
+--- a/t/test_manifest
++++ b/t/test_manifest
+@@ -1,5 +1,3 @@
+ load.t
+-pod.t
+-pod_coverage.t
+ cycle.t
+ one.t
+-- 
+2.16.2
+
diff --git a/dev-perl/Time-Moment/Manifest b/dev-perl/Time-Moment/Manifest
index c092d566ea4a..e133020e5dde 100644
--- a/dev-perl/Time-Moment/Manifest
+++ b/dev-perl/Time-Moment/Manifest
@@ -1 +1,2 @@
 DIST Time-Moment-0.42.tar.gz 159651 BLAKE2B 7fa9f59e5494b11fe0400488631a6ec2a3b579caaee8336e1d894ae8cfc4d5230fcf8660dc74100736926be62ef57cc8f38d2853bf4fbb5b391d77bb628049d2 SHA512 e8015a461c39f3d3ad7d0ca03c0b1e1b5ed39b83bc16f12f00f35d36a4f34786a089ac4b86dcccd5b6e7da8a118873efc0cc2d6a60848bdbff7b7550285be6ab
+DIST Time-Moment-0.43.tar.gz 158585 BLAKE2B 75a80c589b1ba3c874fc3ce78a54ffa0d28558460a671182361c59d064ed249dc654b0260bda017a26bb1a36423ab61884f4dbf7a6adc9e412df231f5cfc0f54 SHA512 b7aeb132b4a6dcd6b207e2a071e66ae703763bd800047906f41dc069f27f36f095f5c7037a5cb306c8da29fab53b6f763eda114bfb0838dca260bb416f9dd6ed
diff --git a/dev-perl/Time-Moment/Time-Moment-0.430.0.ebuild b/dev-perl/Time-Moment/Time-Moment-0.430.0.ebuild
new file mode 100644
index 000000000000..35557cbfb419
--- /dev/null
+++ b/dev-perl/Time-Moment/Time-Moment-0.430.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CHANSEN
+DIST_VERSION=0.43
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Represents a date and time of day with an offset from UTC"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}/0.38-makefilepl.patch"
+)
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Time-HiRes
+	>=virtual/perl-XSLoader-0.20.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	>=virtual/perl-ExtUtils-ParseXS-3.180.0
+	test? (
+		>=dev-perl/Test-Fatal-0.6.0
+		>=dev-perl/Test-Number-Delta-1.60.0
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 941346fea047..438d218bda59 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/ZendFramework/metadata.xml b/dev-php/ZendFramework/metadata.xml
index 5978151ef4aa..101bef2fc303 100644
--- a/dev-php/ZendFramework/metadata.xml
+++ b/dev-php/ZendFramework/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index eb59336fcfac..891e759ce8b8 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
index aa22781facc5..6b47b7777791 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="app-arch/xz-utils:0=
diff --git a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
index 8ca00bf3d01a..722c9c871821 100644
--- a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
+++ b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
index 060aee2e1614..005da6e8e2bd 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/clang-python/clang-python-6.0.0.ebuild b/dev-python/clang-python/clang-python-6.0.0.ebuild
index 5ed21cd33b64..6abf574e9b93 100644
--- a/dev-python/clang-python/clang-python-6.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-6.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/cliapp/cliapp-1.20170823.ebuild b/dev-python/cliapp/cliapp-1.20170823.ebuild
index 13f210c692c0..42c325b1fad9 100644
--- a/dev-python/cliapp/cliapp-1.20170823.ebuild
+++ b/dev-python/cliapp/cliapp-1.20170823.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/colorspacious/colorspacious-1.1.0.ebuild b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
index a0dfa6019cc1..7aeb1a615fc8 100644
--- a/dev-python/colorspacious/colorspacious-1.1.0.ebuild
+++ b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index 2f5f8dc5d7c3..7402f9ece8d7 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2.4"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/ipython/ipython-5.4.1.ebuild b/dev-python/ipython/ipython-5.4.1.ebuild
index 2c5b24121289..a471141d961a 100644
--- a/dev-python/ipython/ipython-5.4.1.ebuild
+++ b/dev-python/ipython/ipython-5.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets"
 
 CDEPEND="
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
index 45197675d733..3097cf4b6873 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/jedi/jedi-0.11.1.ebuild b/dev-python/jedi/jedi-0.11.1.ebuild
index fd79ffd6a5ff..e1216c5e542a 100644
--- a/dev-python/jedi/jedi-0.11.1.ebuild
+++ b/dev-python/jedi/jedi-0.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/parso-0.1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/lit/lit-6.0.0.ebuild b/dev-python/lit/lit-6.0.0.ebuild
index 9485fa2d1416..40ce6568d4fe 100644
--- a/dev-python/lit/lit-6.0.0.ebuild
+++ b/dev-python/lit/lit-6.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
index 8dd931931a63..3a84e005fac2 100644
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ b/dev-python/markdown/markdown-2.6.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test pygments"
 
 DEPEND="
diff --git a/dev-python/mypy/metadata.xml b/dev-python/mypy/metadata.xml
index c7e04f247c6c..637a04f97e2d 100644
--- a/dev-python/mypy/metadata.xml
+++ b/dev-python/mypy/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">JukkaL/mypy</remote-id>
 	</upstream>
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
index 60ac7101369d..8ad323ffc320 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/paramiko/paramiko-2.4.0.ebuild b/dev-python/paramiko/paramiko-2.4.0.ebuild
index 4aeec60a36b3..277911f22ed5 100644
--- a/dev-python/paramiko/paramiko-2.4.0.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/parso/parso-0.1.1.ebuild b/dev-python/parso/parso-0.1.1.ebuild
index db4201381c7f..56afc70fcadd 100644
--- a/dev-python/parso/parso-0.1.1.ebuild
+++ b/dev-python/parso/parso-0.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
index d6d9ca198dd9..801219bee2df 100644
--- a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ia64 ppc64 x86"
+KEYWORDS="amd64 arm64 ia64 ~ppc ppc64 x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pathlib2/pathlib2-2.3.0.ebuild b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
index 1308182a31f9..c9958b30305f 100644
--- a/dev-python/pathlib2/pathlib2-2.3.0.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/pathlib2/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild
index 3c8d11895cea..11533aa2c70d 100644
--- a/dev-python/pbr/pbr-3.1.1.ebuild
+++ b/dev-python/pbr/pbr-3.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
diff --git a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
index d68fb86d0f40..2ba761c4b9cd 100644
--- a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pluggy/pluggy-0.6.0.ebuild b/dev-python/pluggy/pluggy-0.6.0.ebuild
index 09df42b74198..b1ccdf1c986f 100644
--- a/dev-python/pluggy/pluggy-0.6.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
index f7c782f75314..cf6bb73c2253 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pydispatcher/Manifest b/dev-python/pydispatcher/Manifest
index e7a176b3b5bf..1504c5211a6a 100644
--- a/dev-python/pydispatcher/Manifest
+++ b/dev-python/pydispatcher/Manifest
@@ -1 +1,2 @@
+DIST PyPyDispatcher-2.1.2.tar.gz 23224 BLAKE2B 881e7063e61f80ed08f2e46967c7cf7e35d9687025a55d9b446e034085a09627b75263519c16ac64e0cbd9f84e822095f89ecbc52e95ed23a65fcb50d4e90d52 SHA512 a8a94a68551e72da2703a4f7fc93296fbffe78518ff363930125874a2a65dbbe4fe9434e910e0d019fb653785e41d024fe2c9d5bab5072c3989dd2a61ffcb708
 DIST pydispatcher-2.0.5.tar.gz 34437 BLAKE2B eefc2e0f22c9d91b22acd1352d76f1bd69d7161efdf0827f1bcb42ccf0a5c98576dbc25817e0a6c4cb3327b5fad39281cd19a784f0f477ba1b20690e644e867c SHA512 b361463f006a775e1f22cfe07520951649f76c26be35a80ca016620c8ef466129c4abeafe42f0ffdc605e7523287b1e804967f19d951089d24e052fe10d88e6f
diff --git a/dev-python/pydispatcher/metadata.xml b/dev-python/pydispatcher/metadata.xml
index dc6d976885ba..767da7cf7dfd 100644
--- a/dev-python/pydispatcher/metadata.xml
+++ b/dev-python/pydispatcher/metadata.xml
@@ -6,6 +6,10 @@
     <name>Python</name>
   </maintainer>
   <upstream>
+    <!-- 2.1+ -->
+    <remote-id type="pypi">PyPyDispatcher</remote-id>
+    <remote-id type="github">scrapy/pypydispatcher</remote-id>
+    <!-- for <2.1 -->
     <remote-id type="pypi">PyDispatcher</remote-id>
     <remote-id type="sourceforge">pydispatcher</remote-id>
   </upstream>
diff --git a/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild b/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
new file mode 100644
index 000000000000..f5b1510f8dae
--- /dev/null
+++ b/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 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
+
+MY_P="PyPyDispatcher-${PV}"
+DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
+HOMEPAGE="https://github.com/scrapy/pypydispatcher https://pypi.python.org/pypi/PyPyDispatcher"
+SRC_URI="mirror://pypi/${MY_P::1}/${MY_P%-*}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	if use doc; then
+		cd docs/pydoc || die
+		"${EPYTHON}" builddocs.py || die
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail for ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/pydoc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
index adae8eb37779..5560a4f6101f 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
index 1a4b832c1a74..43eb0807a7ab 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
index 5110d91a32bc..fe6ba12790e1 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index b0b8b72b587e..afd49265a83f 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
index e13b154e9b8e..f1567a6ae081 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	app-text/poppler:=[qt5]
+	app-text/poppler[qt5]
 	dev-python/PyQt5[${PYTHON_USEDEP}]
 	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild b/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
index 33723c09a2c6..3e15d470aa32 100644
--- a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
+++ b/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 S=${WORKDIR}/pypoppler-${PV}
 
 RDEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.15.0:=[cairo]
+	>=app-text/poppler-0.15.0[cairo]
 	>=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}]
 	dev-python/pygobject:2[${PYTHON_USEDEP}]
 	dev-python/pygtk:2[${PYTHON_USEDEP}]"
diff --git a/dev-python/root_numpy/Manifest b/dev-python/root_numpy/Manifest
index 858b007f2168..8f35909f970a 100644
--- a/dev-python/root_numpy/Manifest
+++ b/dev-python/root_numpy/Manifest
@@ -1,4 +1,2 @@
-DIST root_numpy-3.2.0.tar.gz 316240 BLAKE2B a8e4b26fefe6ba312e9d8cf9f93ee269d11018a5d7b74dbe2be2b1f5e98a100203292454c893b1a0f63cce6b56cdf965fdc400ca4ef48b7eb9ea3c416814b245 SHA512 da08a33eeb225a57053eafc6247e55fec8c56e231455c255d71d3adfb6119d35d0b41fcf54d5d99690743a525e9d5ecfcde7efe53fb0551e38affa10e336485f
-DIST root_numpy-3.3.0.tar.gz 359688 BLAKE2B 62e0b8ce43863ec5dbbd6a1fbee5cec3dd22cff3c4f3822999ab2a8306a830e61cad5cb07bd2a27937b332a7b7bbd998b8fd61d822173ba8649ceaab52aaf567 SHA512 97a75ed46cdb25ff6f7c680c359cc84cf1a9b0f6204d5ee9e7cf0d1bd0847910be7d0599e9a38df42593c56842d7cf6ecd982c2f3620db5c9162442af59c1acb
-DIST root_numpy-3.3.1.tar.gz 361107 BLAKE2B ec1e38a6342e9ca7de9ff257f2b9442c8e6bca84a6a92abe749833ccd02d837294f9c3feddc9b4d5471f2a5b6ff51e56f10d26939b779293cfe6da09fbc55c1f SHA512 5fe0340c8e0550492b97bde0a75bef4c3b5a302d61090f79e2858b9adf93e0b522dba341a3fb60ca6557d033c429f6c93c1330caf38568a6060ad41e664063e9
 DIST root_numpy-4.4.0.tar.gz 441522 BLAKE2B af3b0b08e80e7cba57730cdb32719ad56be914b5329d953693b898f2bb30c19b3bfa7bb4594e7fed819b08a3ba6894580e38d03f9520ecffab7a67daa17898be SHA512 24afa043e4bdaa74412c36ff90ee8c1fc411801d9dc394ab5036035924910a7f4f304c5c90f4c5f389aaee9dda07b0b7e25566e68c4da424f1b4d59e6184f5b2
+DIST root_numpy-4.7.3.tar.gz 522432 BLAKE2B 9aab3090c894d8917218a68d83269c0f426ee4e7f81628081e9e710c4239bba5e8f88dcb1d91156cf02c7c36b1ee5d03cdd0c3931ca6e2f3eee6c78201386705 SHA512 7c2684ac0e4e68676304e2a72c7169e0299cfea5b4b63f2525a422974ca83f9c9b4f9f11d992acef7d8565cda7f7a85bd13621513cd7c47f1887aaa0cc46d6e7
diff --git a/dev-python/root_numpy/root_numpy-3.2.0.ebuild b/dev-python/root_numpy/root_numpy-3.2.0.ebuild
deleted file mode 100644
index c472f85d8226..000000000000
--- a/dev-python/root_numpy/root_numpy-3.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface between ROOT and numpy"
-HOMEPAGE="https://github.com/rootpy/root_numpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-physics/root[python,${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( tutorial/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/root_numpy/root_numpy-3.3.0.ebuild b/dev-python/root_numpy/root_numpy-3.3.0.ebuild
deleted file mode 100644
index c472f85d8226..000000000000
--- a/dev-python/root_numpy/root_numpy-3.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface between ROOT and numpy"
-HOMEPAGE="https://github.com/rootpy/root_numpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-physics/root[python,${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( tutorial/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/root_numpy/root_numpy-3.3.1.ebuild b/dev-python/root_numpy/root_numpy-4.7.3.ebuild
similarity index 87%
rename from dev-python/root_numpy/root_numpy-3.3.1.ebuild
rename to dev-python/root_numpy/root_numpy-4.7.3.ebuild
index c472f85d8226..81df51049d45 100644
--- a/dev-python/root_numpy/root_numpy-3.3.1.ebuild
+++ b/dev-python/root_numpy/root_numpy-4.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,14 +12,14 @@ DESCRIPTION="Interface between ROOT and numpy"
 HOMEPAGE="https://github.com/rootpy/root_numpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-physics/root[python,${PYTHON_USEDEP}]"
+	sci-physics/root:=[python,${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-python/scandir/scandir-1.7.ebuild b/dev-python/scandir/scandir-1.7.ebuild
index 5b7b33f61fca..8e0cc5909ad8 100644
--- a/dev-python/scandir/scandir-1.7.ebuild
+++ b/dev-python/scandir/scandir-1.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
index 1e20c1e6cae0..cc4e41eefcc6 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		 dev-vcs/git"
diff --git a/dev-python/setuptools/setuptools-38.5.1.ebuild b/dev-python/setuptools/setuptools-38.5.1.ebuild
index eaf165a05dd6..179f967e99bc 100644
--- a/dev-python/setuptools/setuptools-38.5.1.ebuild
+++ b/dev-python/setuptools/setuptools-38.5.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/subprocess32/subprocess32-3.2.7.ebuild b/dev-python/subprocess32/subprocess32-3.2.7.ebuild
index a46f4523c4b8..80b70d306c5b 100644
--- a/dev-python/subprocess32/subprocess32-3.2.7.ebuild
+++ b/dev-python/subprocess32/subprocess32-3.2.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="test"
 
 PATCHES=( "${FILESDIR}"/${P}-sandbox-test-fix.patch )
diff --git a/dev-python/tenacity/tenacity-4.8.0.ebuild b/dev-python/tenacity/tenacity-4.8.0.ebuild
index 4b673d61ace3..c75e8a9b7330 100644
--- a/dev-python/tenacity/tenacity-4.8.0.ebuild
+++ b/dev-python/tenacity/tenacity-4.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/testpath/testpath-0.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
index b1f7aa8642f4..430d546e7a8a 100644
--- a/dev-python/testpath/testpath-0.3.1.ebuild
+++ b/dev-python/testpath/testpath-0.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
index e45bfeda0007..da0816a52c9b 100644
--- a/dev-python/traitlets/traitlets-4.3.2.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/ttystatus/ttystatus-0.35.ebuild b/dev-python/ttystatus/ttystatus-0.35.ebuild
index cdbfd12ec2f3..d880ea53b2c7 100644
--- a/dev-python/ttystatus/ttystatus-0.35.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.35.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
index 4621755b92f3..d18a10fd0040 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index e784ab7c8df1..b0baba172298 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/facter/facter-3.10.0.ebuild b/dev-ruby/facter/facter-3.10.0.ebuild
index 921e49af4500..7e5d9190829e 100644
--- a/dev-ruby/facter/facter-3.10.0.ebuild
+++ b/dev-ruby/facter/facter-3.10.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${S}/${P}"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${S}/all/${P}"
 fi
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 00a1e8166bb7..799b7aeeaa8d 100644
Binary files a/dev-texlive/Manifest.gz and b/dev-texlive/Manifest.gz differ
diff --git a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
index a39b2273a931..63b91fdc922f 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
 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-texlive/texlive-latex-2009
 !<dev-texlive/texlive-latexrecommended-2009
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
index 23f28801be8b..0c75dbd5da4e 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
 
 LICENSE=" Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 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-texlive/texlive-latex-2017
 !=dev-texlive/texlive-latexextra-2007*
diff --git a/dev-texlive/texlive-context/texlive-context-2017.ebuild b/dev-texlive/texlive-context/texlive-context-2017.ebuild
index a6f4437ffccb..58becc6c481b 100644
--- a/dev-texlive/texlive-context/texlive-context-2017.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2017.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 ~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-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
index c1a094842a11..f43cca9f9eb3 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.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 ~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-texlive/texlive-basic-2017
 !=dev-texlive/texlive-langpolish-2007*
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
index f1c8fcbaa6bd..67714b5bfc03 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.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 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-texlive/texlive-basic-2017
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
index 1cd5d6651200..fdfb615f9f75 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.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 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-texlive/texlive-basic-2017
 !dev-texlive/texlive-psutils
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
index 13b0322a0bce..df391f2b08e2 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional formats"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX "
 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-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-games/texlive-games-2017.ebuild b/dev-texlive/texlive-games/texlive-games-2017.ebuild
index 6df3087a5f32..749385d535a7 100644
--- a/dev-texlive/texlive-games/texlive-games-2017.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2017.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 ~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-texlive/texlive-latex-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
index c5ae0d275a82..b2116b5a7286 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2017.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 ~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-texlive/texlive-latex-2017
 !dev-tex/lineno
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
index 00af3d80f57e..25023f0fb04e 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE=" CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain "
 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-texlive/texlive-basic-2017
 !dev-texlive/texlive-langarab
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
index 5aab9a646a11..e85f9dd48929 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2017.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 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-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
index e3cf185ed4be..fa4aedcd76a8 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese/Japanese/Korean (base)"
 
 LICENSE=" BSD GPL-2 GPL-3 LPPL-1.3 MIT TeX-other-free "
 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-texlive/texlive-basic-2017
 >=app-text/texlive-core-2010[cjk]
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
index fb84c5ff76b1..0dd9eef51928 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.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 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-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
index 32f6d65453d2..194d0ff7ace6 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.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 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-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
index f0616982ca91..49436afacb1b 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2017.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 TeX-other-free "
 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-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-english
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
index b473e55f6efa..40aa5a21ff61 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other European languages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 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-texlive/texlive-basic-2017
 !dev-texlive/texlive-langarmenian
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
index bf4e8cd953f5..f0d98e221ee3 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive French"
 
 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 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-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-french
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
index ed5ec8e95258..ac5b88398316 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 MIT OPL TeX-other-free "
 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-texlive/texlive-basic-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
index 9e3ac5b17c19..48ebb1ff58fd 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2017.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 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-texlive/texlive-basic-2017
 !<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
index f2972bb7bfc6..0e6d255f4484 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free "
 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-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-italian
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
index 18dcbd207c5f..0a2266bfdf0c 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.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 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-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
index 7b24634c1ed2..d67c0b7220c8 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2017.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 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-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langother/texlive-langother-2017.ebuild b/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
index cb2022bf92f5..4ebc1da2f652 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other languages"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free "
 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-texlive/texlive-basic-2017
 !<dev-texlive/texlive-basic-2009
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
index 5a32dcf85bce..2fa59225b7f7 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE=" GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX "
 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-texlive/texlive-latex-2017
 >=dev-texlive/texlive-basic-2017
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
index c3d73860e817..725b841e3d33 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.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 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-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-portuguese
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
index 4f6ee5bb6c25..5e486be4d51d 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2017.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 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-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-spanish
diff --git a/dev-texlive/texlive-latex/texlive-latex-2017.ebuild b/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
index ac53d599614b..8009a69a7225 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2017.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 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-texlive/texlive-basic-2017
 !!<dev-texlive/texlive-latex-2016
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
index a351c0cdf9dc..a1b173b6ee1e 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
 
 LICENSE=" Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 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-texlive/texlive-latexrecommended-2017
 >=dev-texlive/texlive-pictures-2017
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
index 109befe20a90..f89958b799d2 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
 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-texlive/texlive-latex-2017
 !dev-tex/xkeyval
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
index 0678e5b46d8e..c87c3c1bff57 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
 
 LICENSE=" BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 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-texlive/texlive-basic-2017
 "
diff --git a/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild b/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
index 60a72a193c98..d049fd3420df 100644
--- a/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
+++ b/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Mathematics and science packages"
 
 LICENSE=" BSD BSD-2 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 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-texlive/texlive-fontsrecommended-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
index eae361b34881..20849bcb4a20 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2017.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 ~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-texlive/texlive-basic-2017
 "
diff --git a/dev-texlive/texlive-music/texlive-music-2017.ebuild b/dev-texlive/texlive-music/texlive-music-2017.ebuild
index b6a1d2d7cff5..090a0ebfa27f 100644
--- a/dev-texlive/texlive-music/texlive-music-2017.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2017.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 ~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-texlive/texlive-latex-2017
 !<app-text/texlive-core-2011
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
index 0b3731a72661..df1f1b2c2cd6 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2017.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 LPPL-1.3c MIT public-domain TeX-other-free "
 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-texlive/texlive-basic-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
index 469aeb2bffeb..207f1ac07059 100644
--- a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
+++ b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Plain (La)TeX packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 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-texlive/texlive-basic-2017
 !<dev-texlive/texlive-langvietnamese-2009
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
index 31297ecfc592..6fe98815f80b 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive PSTricks"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 "
 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-texlive/texlive-basic-2017
 >=dev-texlive/texlive-plaingeneric-2017
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
index 713f8a7df371..18d082be41df 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2017.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 LPPL-1.3c OFL public-domain TeX-other-free "
 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-texlive/texlive-latex-2017
 !<dev-texlive/texlive-latexextra-2014
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
index 9dec0891ddae..31d42b212c25 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive XeTeX and packages"
 
 LICENSE=" Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free "
 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-texlive/texlive-basic-2017
 !=app-text/texlive-core-2007*
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 141c3eacea60..94b7c175e81e 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
index a8a6903ffe90..2a734ea15054 100644
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.65.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
index 7d0c0f6de841..54a44acd180a 100644
--- a/dev-util/ccache/ccache-3.3.4-r1.ebuild
+++ b/dev-util/ccache/ccache-3.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 34bb5f2785ac..3b0ba8919f17 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,4 @@
 DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49 SHA512 f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b
-DIST cmake-3.11.0-rc2.tar.gz 7946761 BLAKE2B 7ef3df8bd1e356a43f71e806f4b63bf3d2ed9363782a1224846ad8c710ff01695ae2391db400d0f2d29ec12e20ee36da2e8019300bcb6e14d051b2e21c83d663 SHA512 4b91455f787c04e4b792129d6168d9c45d74b50582eaf3f738a9a0ddd690c0e359bbd3ad218470c2acbdfd09f4465dd9084433b0a20c033c3177abfb8af381ef
+DIST cmake-3.11.0-rc3.tar.gz 7947100 BLAKE2B e68b44e574e9033dcd9e3bd82f10047f10a228ebeea18a8220d5fbf14c0a36417fd92787eb442b49eb056ba14c7a402f895b99338ef0c20afb66c0602386953f SHA512 6678b2ec8f574b198e8b056292b2bea8996703ed5e22060c737fa5a4c43f48c1ef961e9e128add5960fdc4a4f616c4dc90102a981e63296e0deca2fc0750b936
 DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1 SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
diff --git a/dev-util/cmake/cmake-3.11.0_rc2.ebuild b/dev-util/cmake/cmake-3.11.0_rc3.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.11.0_rc2.ebuild
rename to dev-util/cmake/cmake-3.11.0_rc3.ebuild
index ebda7cc29ddc..61e5d0065112 100644
--- a/dev-util/cmake/cmake-3.11.0_rc2.ebuild
+++ b/dev-util/cmake/cmake-3.11.0_rc3.ebuild
@@ -51,7 +51,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
 
 	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
 	"${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
 	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
 	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
diff --git a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch
new file mode 100644
index 000000000000..6bad45b20876
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch
@@ -0,0 +1,23 @@
+--- a/Modules/FindBLAS.cmake
++++ b/Modules/FindBLAS.cmake
+@@ -4,6 +4,10 @@
+ #
+ # Find BLAS library
+ #
++# Version modified for Gentoo Linux.
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
+ # This module finds an installed fortran library that implements the
+ # BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The
+ # list of libraries searched for is taken from the autoconf macro file,
+@@ -50,6 +54,9 @@
+ # (To distribute this file outside of CMake, substitute the full
+ #  License text for the above reference.)
+ 
++# first, try PkgConfig
++set(BLA_PREFER_PKGCONFIG On)
++
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+ 
diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild
index d46c90b08c16..beb0a86b1543 100644
--- a/dev-util/cmdtest/cmdtest-0.30.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/csup/csup-20060318-r1.ebuild b/dev-util/csup/csup-20060318-r1.ebuild
new file mode 100644
index 000000000000..4bd23eb5dced
--- /dev/null
+++ b/dev-util/csup/csup-20060318-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A rewrite of CVSup"
+HOMEPAGE="http://www.mu.org/~mux/csup.html"
+SRC_URI="http://mu.org/~mux/csup-snap-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+DEPEND="
+	sys-libs/zlib:0=
+	dev-libs/openssl:0="
+
+RDEPEND="
+	${DEPEND}
+	!>=sys-freebsd/freebsd-ubin-6.2_beta1"
+
+DEPEND="
+	${DEPEND}
+	>=sys-devel/bison-2.1"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${P}-respectflags.patch")
+
+src_compile() {
+	# unable to work with yacc, but bison is ok.
+	emake \
+		CC="$(tc-getCC)" \
+		PREFIX=/usr \
+		YACC=bison
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
new file mode 100644
index 000000000000..8aa15049c0a8
--- /dev/null
+++ b/dev-util/glslang/Manifest
@@ -0,0 +1 @@
+DIST glslang-6.2.2596.tar.gz 2270084 BLAKE2B 234d7d201c5ddd91fdaeac1a84104b2b635131fa910315b1d14ae169f6141840a1559114fa2e07775120f56f57d59decd689f44609923152a2e15ecdda66207a SHA512 24c6e90c75767ffc2faf3f0868a7357d5f528cae8972c8b690cda0c573eac0f60f6b8795793534f39ccc2c649cb788101715e42cbdf7ca9d59c955f9b37a4f99
diff --git a/dev-util/glslang/glslang-6.2.2596.ebuild b/dev-util/glslang/glslang-6.2.2596.ebuild
new file mode 100644
index 000000000000..6a9bfa1c48ec
--- /dev/null
+++ b/dev-util/glslang/glslang-6.2.2596.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib cmake-utils vcs-snapshot
+
+SNAPSHOT_COMMIT="6.2.2596"
+SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+
+LICENSE="BSD"
+SLOT="0"
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
new file mode 100644
index 000000000000..172fe8252ca5
--- /dev/null
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib cmake-utils git-r3
+
+EGIT_REPO_URI="https://github.com/KhronosGroup/glslang.git"
+SRC_URI=""
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+
+LICENSE="BSD"
+SLOT="0"
diff --git a/dev-util/glslang/metadata.xml b/dev-util/glslang/metadata.xml
new file mode 100644
index 000000000000..eb4425c3d32e
--- /dev/null
+++ b/dev-util/glslang/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>commendsarnex@gmail.com</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">KhronosGroup/glslang</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-util/lldb/lldb-6.0.0.ebuild b/dev-util/lldb/lldb-6.0.0.ebuild
index 09ffbedd6974..d3ebcd4abd0e 100644
--- a/dev-util/lldb/lldb-6.0.0.ebuild
+++ b/dev-util/lldb/lldb-6.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="libedit ncurses python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 874144df4b80..e0104e27f760 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,7 +1,2 @@
-DIST meson-0.41.2.tar.gz 1013526 BLAKE2B b41b8132f435aa71598043830537002555c15c84b05bc898c81441d69da74114a898e9f402d76554c5f591362b7cd48b0621c66b3653b8f5477f7cdf351f59d5 SHA512 b11dccad82c2380004793e22f538b89d8871f080b55d2c8f5adab1afd4a215fac98304d823f320aefe9946dedc52747e5b2a877bfd80dc8c63d191c542b46a4e
-DIST meson-0.42.0.tar.gz 1042920 BLAKE2B 8d537abcb641a033e228bf93401345ee4c493ba41048e2c3acca960039a6d464bfd8fcc47c0d3be8c1d66a267e2b9ca8d0d8ea55baa8525bc7d40eb5108545c2 SHA512 0a8c3c8c4da70f19de7e10faaf7aef9e950cc21db116a886d0dd7732a70a3dc26996ef15c5eeed79638cf34ee994008e5cb68f7f38b18174e311572ba44e1594
-DIST meson-0.42.1.tar.gz 1044883 BLAKE2B 23a3df2b294a59bf6a5ad355afe448f2a96c638cb6ae3529bc1925aca841b3c02e698db9b238fd902ce2acbd1fc232e94a2100ea6f7a4aed4d8eb11a10ad84c4 SHA512 43dc72ea4aa697c0dea6cef57308f487814fb6cf2a4a2338b658172a43603924122ed892c707eb6b974db72f86d767aac23a7397b97270cfe2032d2e6a68911d
-DIST meson-0.43.0.tar.gz 1066663 BLAKE2B caf96bcc1b5a3b538b2cbb9edd40221a7b826cf06034db3cfe1a9cf941ff2ebe8d6864a4bdad53f1b6678557cdf75dbb45fd9fa49848a9824ac65a42b14bb528 SHA512 17f7e7f87c344ae0a2f53975c65ef3b4eae204a57eb97141aedb4edf65aa21af29a6f61e3870022efd2d126ce768602fbb894ec7d919875dd44ccdb39a5df044
-DIST meson-0.44.0.tar.gz 1102630 BLAKE2B 8365c54ea0ebc72685f4c98966bead90b5c44d761a92e00c5d4801aa83fa6bdeb8386c12e0214ac6a7582a2603649e344c5447a989f7de07ad396e5d5646c6d4 SHA512 32312842bef6d15a73abb250972df29212ae495eb13f9ddf50f300974a42c679c51d34af560b430ef5465f8353d9f98e91a90e749590584968da766ad75ae989
 DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a28fc4310dc8659ab4165ef76ad1729a9daf645330ea213aeb59e5ba9d991d021d1ad620f6673cebfd64b085d93 SHA512 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d
 DIST meson-0.45.0.tar.gz 1161584 BLAKE2B 4344d2eaa9f6242c69fa94603b948a43bb32143791aa9ebcb1e8ec4504af76696bca5b6da903551b4511ab498c4b5a8df4d231c965b304396224c646323d18f9 SHA512 9bc08655e113dc09857a71fe17bb3101d7aea625b65ae73054b0119069af71028d3b46ceee9f3a4eba02f5d21dbfab533c7c113c416881f213fdf01d452037e3
diff --git a/dev-util/meson/meson-0.41.2.ebuild b/dev-util/meson/meson-0.41.2.ebuild
deleted file mode 100644
index 89ba3cee8fe7..000000000000
--- a/dev-util/meson/meson-0.41.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r syntax-highlighting/vim/{ftdetect,indent,syntax}
-}
diff --git a/dev-util/meson/meson-0.42.0.ebuild b/dev-util/meson/meson-0.42.0.ebuild
deleted file mode 100644
index 3be15a6bccb6..000000000000
--- a/dev-util/meson/meson-0.42.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r syntax-highlighting/vim/{ftdetect,indent,syntax}
-}
diff --git a/dev-util/meson/meson-0.42.1.ebuild b/dev-util/meson/meson-0.42.1.ebuild
deleted file mode 100644
index 3be15a6bccb6..000000000000
--- a/dev-util/meson/meson-0.42.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r syntax-highlighting/vim/{ftdetect,indent,syntax}
-}
diff --git a/dev-util/meson/meson-0.43.0.ebuild b/dev-util/meson/meson-0.43.0.ebuild
deleted file mode 100644
index d8f22829f82c..000000000000
--- a/dev-util/meson/meson-0.43.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r syntax-highlighting/vim/{ftdetect,indent,syntax}
-}
diff --git a/dev-util/meson/meson-0.44.0.ebuild b/dev-util/meson/meson-0.44.0.ebuild
deleted file mode 100644
index 6062ca32fcca..000000000000
--- a/dev-util/meson/meson-0.44.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml
index 85ac25a40330..8c8d3c0814eb 100644
--- a/dev-util/quilt/metadata.xml
+++ b/dev-util/quilt/metadata.xml
@@ -4,8 +4,4 @@
 	<maintainer type="person">
 		<email>mpagano@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>suse@gentoo.org</email>
-		<name>SUSE</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 1092025e0aed..365895efb438 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,2 +1,3 @@
 DIST mozilla-rr-4.5.0.tar.gz 683371 BLAKE2B 1654de3811be4eac40ed751b910aed0ddca2100147e47e2e068f625c607964f98d33033c38cdf3a2146284bc477b08299e3432389342e7b058e331f0b924686f SHA512 8e9b7c6eaa9908e75853b5e19f61954b57e6e5afa7a8b6fe55f31aee36bab6ff315b5c3511d14c93dca5da19055a7879b6f3b9f51c349b1bb9acea130187a5e6
 DIST mozilla-rr-5.0.0.tar.gz 1143119 BLAKE2B b08f8ade8856b03fa94057a8c850000cfacc0722090ac3f7d1c147a3c4e7c2bbfe58a740711495e88476d90eb02c6e9a5b85078dcb4fcf3ed107ad281dd3dcf8 SHA512 aaec0869e68290d5f7b752d02e89fc4f83dd2fce4abf91b36c006eeec97555b7adc69da311eadd48c9891599245305b585ed1a53580f7c616dba401f1592c5f2
+DIST mozilla-rr-5.1.0.tar.gz 1158274 BLAKE2B f150e9d05b0a6a32c818f968879d0a394beb6524469cad905a21024e0d79e229f261c766f17aecbacdb81cf8e7408e62d1fdf8677569de8ed4d882b91f93b83d SHA512 8cb7da20ddb2bfbeaf57d9bca76a3b5495d4bd74a00092c40c948570a2cda3dca6cb1e73ed65af099fe405a4d29ff1a852496baf0fcb6119258443649a65766a
diff --git a/dev-util/rr/rr-5.1.0.ebuild b/dev-util/rr/rr-5.1.0.ebuild
new file mode 100644
index 000000000000..09b7822c9774
--- /dev/null
+++ b/dev-util/rr/rr-5.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake-utils linux-info python-single-r1
+
+DESCRIPTION="Record and Replay Framework"
+HOMEPAGE="http://rr-project.org/"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
+
+LICENSE="MIT BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-libs/zlib
+	dev-libs/capnproto
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	sys-devel/gdb[xml]"
+# Add all the deps needed only at build/test time.
+DEPEND+="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-devel/gdb[xml]
+	)"
+
+#PATCHES=(
+#	"${FILESDIR}"/${P}-sysmacros.patch
+#)
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="SECCOMP"
+		linux-info_pkg_setup
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i 's:-Werror::' CMakeLists.txt || die #609192
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-util/rustfmt/Manifest b/dev-util/rustfmt/Manifest
index 03d657d8e7d7..b2e97cc2a160 100644
--- a/dev-util/rustfmt/Manifest
+++ b/dev-util/rustfmt/Manifest
@@ -1,41 +1,80 @@
 DIST aho-corasick-0.5.1.crate 29015 BLAKE2B af79c5c22e2b4d9ab81d7b0ccd70a375853e50277edb4bd31d0ff9acc670d8776c14044ac06dc659209549259ce8debc18d63ea38ac6812cb52f0f28dd2c8c7f SHA512 81dbcf720613671880c5f28066a1368ee7e953c5d9f44253dc1f9c31b601e87bac518baa48cfaa34b905a4f687ec30233c1dcb00da093dbe502ce8a2f96b9619
 DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
+DIST aho-corasick-0.6.3.crate 24963 BLAKE2B 7d22a3501664a4324e43a20874fe4d2afcb1576d66f76bcfd894c0ea03b0daefd85e03e20196370dcb86d8c81067c3bc2202889349389c23b876d4b2bf8f2bbd SHA512 4d0d55d8a6657fe13009d66728b7417926325dd9ca4f7ad7cd5d40e59cf0a55b906cd109d724a0b385ee988526535fc64a467ded171419e452c5a8c90196ae45
 DIST bitflags-0.5.0.crate 10940 BLAKE2B 69d9f52d1dfbec986034981f4629022b25b94c01d54424ae2399a0749c51f0f1c725ca312cfb3f953efc95732b7ca32e432e29b1e5bbba416cb4e0c21a266546 SHA512 220511ed57391bbbd4c8828cf485aed25d078a1cad6305367939072383e48468d545550002398a288d30d8501b9232fb9a91e7a3651f67103991677b9f25de0c
 DIST bitflags-0.7.0.crate 10851 BLAKE2B 00a4e2b66275d6fc8a7374aeec275b5fdf0e2c197e7e90e56afe89ac45554d14ba2063aa26a486dd88d822939b6ea5a5b40936d45d8717e2a98e95ba1d3f501f SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0
+DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
+DIST diff-0.1.10.crate 7534 BLAKE2B 4dbb88e8b516de6441a1e1a090f0b58399c53bac8bddc212bcc2acd05613ddb81ebe689270aeca01b8395da02a5bdcf80ea9daa050c85d5835915ed4d901978d SHA512 1ba0f700ecd4f0598ed3d32e5f54f8df9d47b4a440c8a16ac99a45fd8401ef68acb6b743056fc769ba29f5c060745de7fec697aa1dff14f44c8f7c6bec74057b
 DIST diff-0.1.9.crate 2954 BLAKE2B bf192e188a616626e595b29095f55b4c2f860dcf8dff527e85340ab984e1cfa29e541cd044adbb70f0f2659eb671a1cac11a546fc04386e5ef412679c4c6011d SHA512 d208be8da107d438168197c7ea67377048519b350c10d30410b57d71954ef634d03dfdb87b88f5a9fd7e0527ac31d165df95bf7a040b03c161831b9bb3f78dee
+DIST dtoa-0.4.1.crate 73264 BLAKE2B 36698b6d78a1abc15fe36a9cfd545cf91c116d249b52b710bc098cd3857bef6ea1491e10c641c3e4fe8b6bb91c66b7623e22090ea182f2af61da6bcde1a8d032 SHA512 eb1be73a72f1b301371484aabfbffaf69692ad6baaeaace810d7bc8097a5084cca8cc37abf561b1371cb08fad04e07b24bb2149620a785387759813189682fda
 DIST env_logger-0.3.3.crate 5603 BLAKE2B dcb2e90e5b3476a11c4f2cd4449918375fb530b745b9e598a69a5384b03ec6908d62fb3c32ec2b15087b87e33a090e2d1fc7d9ae52de4a5f54413e3fc43d2632 SHA512 336384348b052e5af4f1b8be2930e124b35b4652c4c6fdf4861012092b81790da51776c6fea1d2667bcca65d0e0a27186ceee7aba6657a45551dfbc37a348b48
 DIST env_logger-0.3.5.crate 5950 BLAKE2B 89772523b6beaa965be1548a0193d92a0a334e301b23e94bcbd407c1e0d5c31ea999b75fbc48d007529ac7581f92866a654d0fd67cc2df329a1ba1ce53c0fdf6 SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181
+DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
+DIST extprim-1.2.2.crate 40910 BLAKE2B 92cf01e760fff5f1b8f880779c97a193bd338e9a4a4257d975082db873fa0a891f6bf700c629fcc57bbc4acb707a34c11da4273f640b9a527497325ba1cdaf4b SHA512 e14c5720c799b9822ce27fb000eb040b3aee41634c3a80a4ac275fd36575c777e0103b8572afc1d5c4ca9b08317b7620cace93fedb9363983617e8d8927cfba2
 DIST getopts-0.2.14.crate 16622 BLAKE2B 14dc08b56cc7d11bc58bfe952d2b3958c5b0054499f2a4bb7b7bcd100dbef5ab3c0fba4ac7f50b688512d71fd0a7eb27568c9f26023c451f0034883742ddeb45 SHA512 bb6101403b6d4ed6102dc84c69e95114c0f336924a3f45643a5a92ca82a2ad5ef6b0405e1975b84853831dcb7518b24d094a211a54cc2b46d32ff914e2f977bd
 DIST itertools-0.4.19.crate 64212 BLAKE2B 0136195264e3ebc1aa0f109049902799ac5d6e9bb9443dd9841e4bb9e82442f07a7dff8a3eb8c7a52790df430edc5d535783f63a9ace9965c97627fa22930723 SHA512 3cc1ec3928ace76394572a92f28d883a11f6f6481a0efcfbb9ef73b30e7f1f0ea35c407639dc45feb83da16bb756faa10192c75aea0cbfe573c22e20a5d97c99
+DIST itoa-0.3.1.crate 73340 BLAKE2B b1cd133bf79f2c1ea7a38c5607a12cba1d8f707e65208e4d8e30448e0486320efb1933d4f19508a710b46803133bf98c33666d3406a2f52897d8544f8eabc611 SHA512 b6ade2740fefa2e437ad82a1b9ad7c284593f3525a6e746aa377e0d52b434f7f46a073df552c5ba9e9c47f1737f349654c38261c08ec762dfd9238a8d9c3d3ee
 DIST kernel32-sys-0.2.1.crate 24530 BLAKE2B 8672864fb347a8cae336d822bce493ac98e11e807413bd8b8c0b141226f5db8fd0a306acd1c920a625f0aad248bc45b3b44a2d605f0c762edce283a4d73464c1 SHA512 7d63fda3200fc565853e5c2733f06c97f48f94ddfb13db73f889197917478948c3f73b61a9c0efc42cd4f8a4355af4c1790e3145ea18f35ccf29a2be997f5bad
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST libc-0.2.16.crate 104182 BLAKE2B fb35aeeeb840b4b55f8ef3ec3e722ac57e69cd175396e6f2e9c1261f4a31d6aca9cf042514dff4b80eb694f5c3ad9523f3122015e199b617bf6d017bd3356add SHA512 7af473d11ad4a34e9bfbd1dddf77d3d39773f76d779a60664458fbe0acecc871286ab41d90beb0ac5ae7285099ed1ff0c94ca69f5cbac4d3b2cb56b0ff766203
+DIST libc-0.2.23.crate 153939 BLAKE2B e89495dc4b9bb791bfe51e31a8047a20b74ffd585ddd81daec411c583d5d66b0c4fb2ecf13b19d2ef49a7023018df395f388681b1cb7f2f0449ffb4babe8a8ca SHA512 34620dc5ea9bb674a74a5b3d14844c098d38980efe4940538f31ab76e29dcfa6b9601a4747da7a8688758052ac416aa8dd693c752a3972a7bd66d9deebff2d72
 DIST libc-0.2.9.crate 77923 BLAKE2B b9b1b62ba6c06ac6b19ae639b20d9da4dfebc176ffb8c1caa9757311c36ddbf941c099ed3bf644c51baa4caeab53898faef8a8422ad48ecdeb8bccde6cb59f64 SHA512 4c0c7d1a28f42ad9c7ac8a12171a6d5d747b174ad3637497ea0db79f3b72469f811f2f6fb8dbbc6aee8d9e04637a9de7d8888db766b15a35b428c986d2650a16
 DIST log-0.3.6.crate 16110 BLAKE2B 6dc589c3c24f3bbecf60310bfbd187179ac18afae1a17e6d28abf38f322e740aa02d73d396926650c347dba24afc50e3bb4cdeccf74ec7511ff9a7277084f5ec SHA512 f2e5526a2613f70301a607cbc79213a946a6039f85473f9de28ceb2f3b464be61a584f34ca6381e077d8bf6ac751c93011087d1723649c0d7722281f1a2b7174
+DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
 DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
+DIST memchr-1.0.1.crate 8221 BLAKE2B 2b3553c5da6bd6eef0cd716fa9e6856aac0a03a566d038e7b0d2c469e16b682ea985d293fa4d8f85cf34e120bce51732e9987061db396f0aaedafc900c13fd86 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6
 DIST mempool-0.3.1.crate 6678 BLAKE2B 6330ace3f58a43852d36c825cfe1fcb467412db7018f542d0270156a947ee3cf990126d094542f949d57c481e586841d53d6e3eb10038ab7a09d26faabb03ffc SHA512 79c6d1891b6d8c6b8d2e6ec76b3ce49a4595fe5d4d21320c004657c6db37d0ef56d7caf6a7e113a1ad8332fa5be333aaa54e7a7ba88ea59c6ccb971e7043ef03
 DIST multimap-0.3.0.crate 10681 BLAKE2B 8b5fcc7481ee60e6fbd032415906c2275b6797f874161749a752538414365ce9a1ef35867d353eccd64294cf47d3c0d31bedf120539be4594e10101a86d1e704 SHA512 ba1c8c4f9f23da2b80b5a16668b8227d1147aa9999f3b11343deb3e4b0582ead6fd957b7d0cb18f4b8141df3e6c8b81aa7f6c2ee0d0d61868b4e00181f5f290e
+DIST num-traits-0.1.39.crate 22618 BLAKE2B acacffc5ba41e2eeab0cb50f2746dba800fc5ebc4b9bb32000678eae117bf0e26d52b8225f71ac7c646bd7f5d8ab37615aad74086dc6ff4ea25e6e6fa141f024 SHA512 daf317fcd87807b2e295a4f748f1152f5a9b012bdada80204c97d33e3ef18c89432680db6f79ec655e585e0c38428c50ce5fbe7215f626af6f6f83eff47a364e
+DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
+DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
 DIST regex-0.1.63.crate 276618 BLAKE2B 8f7258e068638d02e3edb608480042b4f93e5ebc4c6f8a13d491aae02f05a24ea2839a9d603fe79221e18e178f92d4edf6ccc8911fd2e37db49d65fa13d985f5 SHA512 1758fc37f60e64a44bdaee66af84e9f5126c694186cf17612da7ff9b828261cb5136ea34a14e0a160cc7de2aa211f8fa806e3d27762e3aba8d0f4e0ba8c4e13d
 DIST regex-0.1.77.crate 185559 BLAKE2B 62e621f45375f4bdd7412c834f6f8efc25ec7e90e80b1b4d80761e39afdce96718760b10483504ce5c0427f76c307982beac00557a80c57860d8578a40b9bda0 SHA512 6b63a8d51a79ff020f6256d319d86e0a4a5efbf56071877ff4f23bb283c5a92ae914b6d7a00e4ac85c1b0efd45f68dd3672356e86a63343cd3ee6be1a206bfea
+DIST regex-0.2.2.crate 193403 BLAKE2B d8b439c1544b7faf15fa073f9e759a1a4bdc905290da12d22526e00d22462e5b4d29fa928a88cd6a60902958b828539d04c65f9d8f2d00b3b75805dff9763afe SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3
 DIST regex-syntax-0.3.1.crate 115911 BLAKE2B f13f70a43fad2abcd60a2d906cb04401b9eaaca0f74fa79b19c69bc8798b0805954d26e345788225f0a18d48488ac55758b9284b03ef749605b0b1f6e76e78d2 SHA512 ed040291d3c9e195923134fae7cf436752578c9bf975b48e3a426009ea5a71eb3852441036726781172f2006dc450801b12f6dc0cba31e60d7ed4fa8e85dd721
 DIST regex-syntax-0.3.5.crate 116666 BLAKE2B 38a3d258817405f3b0e5c01703d8da6e1d4dcd8588013ab659f02c70fd1716fe24fda00106f967f90000285d1f76db10086cf3596e4daaf8ab482f696e689873 SHA512 df3757a583b546af275937264788d04fb212d13fbce84b4200e88f10aa38558cf098ec7f91b838c09905ae2b71a8984566b71ef9f9b6e74d9404f3e5a4c027fc
+DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
 DIST rustc-serialize-0.3.19.crate 40870 BLAKE2B d0b944e3f73e84ca31164b301805f82ad3513119f642cd17dd34b6dba6cb776d665e60d0cb576a5d33ddda5bdf88d6d548da68750d5fb7a388a2d369d8ba583d SHA512 265f6426287e532822ba4ab7e209b0a0ba0fd58466f292c38b554ea12c7a992ad1a1910e10d151eedf1f0c99c248c64cdc4d4609cb67e36472e425d315f8a83e
+DIST rustc_version-0.2.1.crate 9840 BLAKE2B 765402ed397f839f1766da11ac80464d2f3cbd150508dcf1336402eaede9c20052dda4f9baed6ad73192c7586a50147b53e6c45a8d534463731653c113cae85f SHA512 edec68b24e95a04c58a08c67b58dd044f28930a87ad04aff0c0c66ffb3f1e89ab07f2fb9fed5e2e8c6ca3b372225da347bc10bbcd13d62b4552ab15abfdce0f7
 DIST rustfmt-0.5.0.crate 77624 BLAKE2B f57fe18e12b00961d845bab8977f2e3ffc22e69120784da107cf7ca429b12b4a50066cf7ef0e786166cdb2f939e20ce97a3eb05ecb4f5fca03c09de047c78c8d SHA512 228a68ba7d2c12483635506d2564edae3203848fd00020554993ffdad3d160be78ffb917564553f0eaafe2862c53316447dc131269cf14abeec9714a137d8fed
 DIST rustfmt-0.6.3.crate 88474 BLAKE2B 551cb0ada50ef0b388a287e9d42ee2a67dd9ba29f6c8ad48481325b6c7cbcfb2c31cafe5cf4081cd2e237314378742e5b195da226a747a4d863d19ab8f8f3eba SHA512 d2b12ae9cb78af43029363d97dcd5e0bbbc4f1eaf96d738b06d2c13662b20b9e4ca975056ccb683be3e52099307431da9e31db452f2f355b825bb1bd83b12f80
+DIST rustfmt-0.8.6.crate 110133 BLAKE2B 09d41e337179b534504fd9f9c259f07e90564c84bcb8810cdea1bc7b45fe4e10b85baf0b4f4dcb0c117876240f072c267a10449ec3ff8af0e765233394ec5141 SHA512 d7f8baba7b35a18ea21c6b0549bbfa4b2e2ff6bce681b4395ac5a08643f138a8de492455edb51d9ed1553cca19807a503b113b860f11359a33a339674ed9cb81
+DIST semver-0.6.0.crate 15598 BLAKE2B b46a0e8b782550a49174e461b447e617f0232d9df3bf2363273d4815452df5a587ba7534c843d7d68969166059704e1e8abd716623cfac5b42957b2eda55e14f SHA512 8b4dcad3c672ff8468a68fc19de2804e079af1a75406d71b996621021b5e05dc53fef972455fa9146c199493b71e2b80fe180e33ba4ccfb4dda10ba962a0a6bf
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.8.crate 59699 BLAKE2B f60a77b40d921e91b1e55f3c5f0ec7e1f05aca92f81c991a86c0d8c58d70451e291b94fad5237d23435b144bc0568062d8560c25cfd7ad0e984bc61383e366d9 SHA512 743ab9518935ba219faab7f61f3ce30d6e20c20145ed9ebe46df49e570e74063baace630eacaad2f3b7e9e0030b64faa428810701537a6e2a5224802bc55edc1
+DIST serde_derive-1.0.8.crate 24015 BLAKE2B d97f73055a5375d338fd078f2f55ca3db59c5c6212c9cc02817237ae964fba1076bc8e901f0d80285619568519745f9d55731ffacf3e4965aef80a662f61bc7f SHA512 685446ae6077ac8e730358d8676e9648ed0dca3638c16ab3b14ea0e6823f1743af1b41933ed2b8f4f5e497e8954c954c40dbbe8f8e6d66a0b0caf3cbe2612a3a
+DIST serde_derive_internals-0.15.1.crate 16441 BLAKE2B e1b82c9a0b8c08eddaafbaa3ca5c23aa1b11462e3e45912d2ee109a991206df5a65605739bf8365e3a29836c2fb0a551401bb090f5bf1418c5d6ed9d41c91bd6 SHA512 5599b3022f9a1f16566c4d86ae2f173373905ec318499ffe28a061e58494f786d0e6dff6ca962422bf6d773604b66f62b0de8e19cd39057456d50e923180a41c
+DIST serde_json-1.0.2.crate 55422 BLAKE2B 346d929bfebaf04b0afaebc9ac1c54119f2ce9b77e7163b474fe92669051bae12f0e2fff8ce9899219cc37032b4ea9f5dfc2fbdc022440246526ee11dedb71bd SHA512 ff0a3806b138cadace0ffd600ae695047e6e75655699054e8974160619ae5a00e8d306b85dadb0f08672d16934f43870627e5619af29fbf68497638eb133d4a5
 DIST strings-0.0.1.crate 12981 BLAKE2B 224439fdb3c46298e9f0789ba647d43fa7233c7283f1910f96e59de4236c43271762e78aed33bc60fd0e3d8e0137f8646bbce865649dffe079d5ee0393e189c4 SHA512 be94151f46962ce4980d225af4bd007cd3bd56e630e361078b119796ae34566db97e8f35ae82e6bcef299fb79cd3101570eff25914dd9b4b410ea133ec0938a9
+DIST strings-0.1.0.crate 14234 BLAKE2B a84f7136072e1e403cc3b1a18c29265ed04352e338b683d52fa3f2e2f546924ee71a11e87ed806153e58a6f25444402a1a88bb33c093cda1d98f74f131e4072c SHA512 ac7aac7456d74263bfca93443041517938ee59c4b807877e70d4abd2840387e54eac41fa8406a263e317109401d16df662306756c3d869757e2a48643310c214
+DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
+DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
 DIST syntex_errors-0.44.0.crate 17411 BLAKE2B 1c50d2c778ef367cca18703f5da8915a48714df7e16ac0e4fa7481c1e580503f93c2dce59f216f2eba6294fb6066ff17f532cb2e4a7759b1e0f52e82491e0f66 SHA512 25a4f8580e253b10fa08953b34e66d6ddbe85cbc9f872b8343e739b8a8c754b823ae7c948de9678c2f3bef58bf54bfe35fda63b0eaf7f5d5e935143f531d166d
+DIST syntex_errors-0.59.0.crate 29194 BLAKE2B 36c35e5e5ecfe433e756b75ce09e1753496186ec178c6bd44725b4676af201eab1e833cb083fe9092beb3a9bdaf2a244998f8a7bd503e4e48f6985e884f3b465 SHA512 ad6931e3a9d64400deba090e8f269eb81ede1582238fe3889b35404ae38c4f33fd767ba9bd69cea13c87585f40271d41c7df6cdd9ebf7e1401d321323f4fc442
 DIST syntex_pos-0.44.0.crate 6883 BLAKE2B f59ba27e084b792ec420b9ddbc9dee79a49b9dcc4399a3204fe7fb2bd698bf1d2022897349200eec4854672d113b20ecd3c868a61d9747814ab37f838d7d01f3 SHA512 856a3103446afa42b615668c74ca073af55c03e8d1e3043ea120889aa9e18f284fb43a8982aa9bec4eb6bddc272e8ff45a26a8570dff1777c945185ae500a280
+DIST syntex_pos-0.59.0.crate 19199 BLAKE2B 9181c16d570591e0b05f0e11c0de47636824f8f924ece677ecec08fbb1810d6440e9780d56c625fade6e9ed214370d58ccc18756f6cbb2c6dc3e030159dcb883 SHA512 af1af6b6311d8dfb713850b48e4b4f4b16cde7249822a8b62c255e4b3c70e88fd4a5b1cb0ef9394b7f9f2833ca406b8d5a4646dd1f59868987fe0fa9276264fd
 DIST syntex_syntax-0.32.0.crate 663466 BLAKE2B 759df4062e032a9ee69619f6fae78b76f6bd5d0ca213739b028576141b44c62f0baf830b77477917049a930da05b66494422456d564f4acaf314dd3205deb8c9 SHA512 28059e6c68dc1324c0fb4411f829ad6a25fdb4573e15be5021206fb519b1a4d350129a073d279c7bf785308becfced5ecbdb7a60eb6ca78eada0111b5480d61b
 DIST syntex_syntax-0.44.1.crate 257816 BLAKE2B 22fb37800cc55ad21bfd4be1daa3c43a04d957338077e4c88a2f615aa8c35fdee5c2d23dafe0d64e35ca6497291ff219aaf74ad39d5adce802e908f9d22658cf SHA512 4d26e2a207efefc42993fd2e707a7b16882dfcf91e6d3ad385e210c3e2e9dafb3686e5a508ec27dd5acbf7bcf8edbf53d891cfb925b782691fc5d4243ecb376f
+DIST syntex_syntax-0.59.0.crate 269946 BLAKE2B 5114590f0902ef14d1dc3bddf9f42b4326dcf0ed70c51c9ff3279a0c433dfe0eac5f671eea6e72c0bc2302577c80ef96a7989f3326b81c9e3673b8052faf1808 SHA512 08420148294c2840f92b10cc695d5a2c50a72501c1b191fc863637d62ac673bd68fd6f08826091a932b3cdef228b175f37ac98186b4c797f249b5a7a7804adb9
 DIST term-0.2.14.crate 25395 BLAKE2B 1c1ba25927fc1bc4e1113214ebed009f5ce96a0f7d361798bd011fc989d5e8b8fd876580790c4043bb08e5d6af20e6f0ea2f0851be4ee79f643d3e45a0a09b3a SHA512 34872c1c1b06afb79ed3ac8a92d9c145681d22c09a3f1f5dd6047dfcc177ad5b1b9c9201ec982009e9f85d7ea71bac26d1f317fecfc67d2cd7569aa52c3327ed
 DIST term-0.4.4.crate 35853 BLAKE2B c3cc3955790f68d2500d6103f93a8d5d763d4b5ed3e00ee437cc597b4176bb6891c6b63a1c49bc7c85bec23906b09583fbe7160ef14d868eb00182d1da4d6165 SHA512 df99c7273ca6f97ec3d9206f98601540d26370124a7a5404cc072bf2e6621bc48fa74101e60f29bea10869278401193648e253fc2029f4cf8e3c8303625b11f7
+DIST term-0.4.5.crate 37496 BLAKE2B 4b0b4deea60e446150ca89f8fcbff5ea38818482a5a995215c21f64d6fd5b4c97f3b2e61fd729e1e2e004b41ac0e4eb37e6e477b983c204d8bbd4990e455d875 SHA512 ffefb5d3611eedea8508611e6c27d9da32070f2e8ba998cbf060791ac36a2d58b310981c742f638967f0a0a7de70ca40b4b6fb093d3fb643b01cbf73f8e624dc
 DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
+DIST thread-id-3.1.0.crate 7195 BLAKE2B 8bed46dc27434635f5dfba629e56c2aa1ab0a74733d37b9e90339d70443471e95bbe59672525962143b85df60b6834e1a3cf98b071c07eab371419e09aa28512 SHA512 f24b2608cb476829d43b71aec0e12a12123a8943402755ec44f5eb4974e63ce7ff1d75f5046ddb533a08447c98758c226163e461c52413091d85f6267a19af13
 DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
+DIST thread_local-0.3.3.crate 10964 BLAKE2B 1cfdc1a83682243df8bd3fd75b00f174f6e07e7494f47f9b580704cde47c91650d2733fee331f8dc3209e6b1f199b26bd07aae02a3981c9769500ab791bea053 SHA512 19b4d445c2688898d149a05aec7c157f5c8cf48a60fa98b8890bc70ee8f391fc94d454ec218002063bbaaa715326957ab2dfda0537b782a2643e908b64e0f22d
 DIST toml-0.1.28.crate 42323 BLAKE2B c2a726def30924e8b56d594f01163d577cc524f3d42b7d44b886d1b55f28ce94484c1624c31c0e3f5718daf634c5ac9c00967520030c00a88a95c1574e882f9d SHA512 4b4af8fa2f9079259e2c4ebddde70e82f96603c4ec69a266394366671a5c42c61a6ea13fd51145a97c286ca48cbe731650065fac1c20822f818aff48f2a2b13c
 DIST toml-0.1.30.crate 45082 BLAKE2B f5cb494fbec4f4266afb3bdeb1be66975bc127ae16e207618594528ee32859aa337631a08050f84e21e7240f47b72d8c3f57e83126631a5028223a64975e09da SHA512 e6d06f47750fea66705f7b7e34c396665c564dc7687a9d1ff5f56bb63f37aaa991c253a022f76aa8857e9b95dcb0c11d0246889df98d4c8aca34ba7e1fb97ae7
+DIST toml-0.4.1.crate 54017 BLAKE2B 20fd8f0f8501adba0cfc504446d490da8d488efe218f54e8b9bda2e95d70b1a26d660fdfd512bd6344a2858e7a813edb10c26f366041171407db29abd1025654 SHA512 ad603d1011c253eda1366fdc9781a8d5f6c3792cde26cac2552e2aea2ab7e2a926257587362d5c11518e397a96d59a4c38b0418eaeb5c584c83a37850d488480
 DIST unicode-segmentation-0.1.2.crate 53030 BLAKE2B 05827df7bab2e96ea8af542cd3700de685fa7f32d11722df0fac9d266d037cc8dd6a8791d0887beb88c1b40c7ba58462cb9191aa16d92061cb164d0d896ac3f2 SHA512 bdc196b56b7776fba44ed068823752fd48b962fbf9fa64fc3b976ab6ef3bced449b9f76c2fa5ab5c91294253b697871c1fc66a9ea6b95f087fadd1ee047bddd9
+DIST unicode-segmentation-1.2.0.crate 67562 BLAKE2B e294566ff0f0bbf8873c73c8f1103bce8d4d0fc8a03f41b299f88aeacecbcb44a3cf2ce95aab9682177a9e3f2e3db9cbd53403830c761724ee3654b9c328f862 SHA512 724fb05d4c02926a535a3380f0a718e5ca0b61c71173efccee6780e878b3e890f11e7941cd970c6c1763ac756f31fe338b0dba2ff31db2aad29670bd6e8b9bab
 DIST unicode-xid-0.0.3.crate 15998 BLAKE2B 2e112dbd311399836dd12ee37bbe7b9d83ed6fba89549784f1bf2ca9479b3e3cedd1bc2b15bf5e21b0cdb30fd3b88b973aadf37cb634024316ac33fc77d98d11 SHA512 268c1f3ec79ed2255c4e3759e4526b4892cb04f54ced07afbfff0ff8dcdec953e5b540fcb58b30bfec01b6401b58ef3b21320a0c1bf3a43aec22f0715568dcc5
+DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unreachable-0.1.1.crate 1772 BLAKE2B 5d2400959e334d483f1b2a6accbc6641de33df02041d8c7ea23bb66cb0d34c9a911d70926f0849bd3004ff1683c3c212ab7877d6c3b9df535726ea81f7237a20 SHA512 81d7e8740630ef90341bed76f5be55c928c1f28cf46ef23431a7f610445cae884eea532df805784b2fa04034e831255a3102a29fe2c228b8c1c1afe15d01cca0
 DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
+DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST walkdir-0.1.8.crate 19807 BLAKE2B f5e89df2365a8ac34728d49bf0248014ef9dc080dd117ab699572aaf3c3abc695eb105fce44ada7d276d53201d5ed43134c7677ce1c6b31fc13128338f4ccf3d SHA512 292602f33d0eec44529f9fd763a76420177d7a3a417645975053871823b6531691cb0c253bc8ead2c32cd061538c161701aa86b111148960417e2d5e198b0d0f
 DIST winapi-0.2.6.crate 741153 BLAKE2B 908a8fce05cb76de370d5eea6463654b10abe09fea5e04c5762d4831662470dd4889f0bd211ada87966cb033b698f80f23e6cff2fb8474d26dd3d44624e17015 SHA512 ee81295e8154b0656b2ec892a38c69b3e1f839d6915ff68439ab5fe9ef9cf2d85cdadc9e8c9779d0eb3046821cafbc1f6e7977057178c85b29a21a86781bcc38
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
diff --git a/dev-util/rustfmt/rustfmt-0.8.6.ebuild b/dev-util/rustfmt/rustfmt-0.8.6.ebuild
new file mode 100644
index 000000000000..34cfca3fcc58
--- /dev/null
+++ b/dev-util/rustfmt/rustfmt-0.8.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.1.5
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.3
+bitflags-0.9.1
+diff-0.1.10
+dtoa-0.4.1
+env_logger-0.4.3
+extprim-1.2.2
+getopts-0.2.14
+itoa-0.3.1
+kernel32-sys-0.2.2
+libc-0.2.23
+log-0.3.8
+memchr-1.0.1
+num-traits-0.1.39
+quote-0.3.15
+rand-0.3.15
+regex-0.2.2
+regex-syntax-0.4.1
+rustc_version-0.2.1
+rustfmt-0.8.6
+semver-0.6.0
+semver-parser-0.7.0
+serde-1.0.8
+serde_derive-1.0.8
+serde_derive_internals-0.15.1
+serde_json-1.0.2
+strings-0.1.0
+syn-0.11.11
+synom-0.11.3
+syntex_errors-0.59.0
+syntex_pos-0.59.0
+syntex_syntax-0.59.0
+term-0.4.5
+thread-id-3.1.0
+thread_local-0.3.3
+toml-0.4.1
+unicode-segmentation-1.2.0
+unicode-xid-0.0.4
+unicode-xid-0.1.0
+unreachable-0.1.1
+utf8-ranges-1.0.0
+void-1.0.2
+winapi-0.2.8
+winapi-build-0.1.1
+"
+
+inherit cargo
+
+DESCRIPTION="Tool to find and fix Rust formatting issues"
+HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/rust-1.8.0"
+RDEPEND=""
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index bbc7760a8b6d..908bd63e9cbd 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 427fc0be5a9c..a518ca75b36f 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 9c7d64b792c6..bcfe6fc44203 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,18 +1,6 @@
-DIST git-2.13.6.tar.xz 4756820 BLAKE2B 5fdb7aae5ceb1e1d0bd9be2541e8d39f28503ebeda5ef30eee306348afb290171cba7f8d6e0002775288bfba699ca12e388a4007008509d91a9ac92e90fb5d5c SHA512 ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada
-DIST git-2.14.3.tar.xz 4802252 BLAKE2B 9b5a13e337ba1f4609875897a3ee92dd5a433fa5e7f8bbac1436dcd8275514378fe99dd8cfcf6212e27825e43f000100850ad6f3a0b3fd53bbf9ee820a3973d8 SHA512 e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643
-DIST git-2.15.1.tar.xz 4894768 BLAKE2B 89258e58ff06b50759364c79bebc9a70a267eca7bd25c1feb73ca49cb2b9cf5f6b890729aee4c9bda9025cbacfd8ed29d1a251ee0add9cd84c277e2bb29dbad5 SHA512 dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b
-DIST git-2.16.0.tar.xz 4961856 BLAKE2B 5e7e3476de93f718c85750a39ab0923b41ca573708c4bd82af37577c2cb6067c4a989b50262f04c34d2594ec51a47b3c80394ab7910b9a47bb1aa1ca09cdd1d3 SHA512 11f8f3b5e015cbf7aa768ae66c8a4a81417d78736c10e6e24a2b83b7c3ade3afaa6934ca156c5bb9c3da80cf445549601d494bab86611d7eec7865dbfdcbd812
 DIST git-2.16.1.tar.xz 4961656 BLAKE2B d94328da5d027cb82f1f23804a12dfc5df1577bf2c28cc376d4bb5c9e34d317886437f7eee2ac4503b8e2639d2e24c35660ab82a50207f500b7ed6fb104d3624 SHA512 09e30ada7bcf41f78f15784908062c10162d58d2fd7a68ad27e42fd49dc37eb0e82c19ad21db31034a189a8cdd009013a29f943e1ae5d5ab5688c913d2a4d42a
 DIST git-2.16.2.tar.xz 4963204 BLAKE2B 346405b765bb542f0e51e539163c18c47dbd2ce1d4ccd98cdc4ddd226ec14a4895f7b82168fdca90e1828813421d24d5436fb01e9e9a57eb98a80984bab13bda SHA512 ff1bf4b94c09de26acf85b97003582002c232e5861a896d8c2d8dc011cb3d4966b1eb0e74ef94f80426d50bb465bf6c9b6edda13b1e4143f0eb38ee01f4890e4
-DIST git-htmldocs-2.13.6.tar.xz 1110668 BLAKE2B 7cfbd453c72c3e300244f9a8c4d13efd60d22219dee48f6a06e6f23fb3a0bd5bc66e624829d685b3ae8b47b81bba39e605f0dd6fd3459364c83b2d922be94a64 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc
-DIST git-htmldocs-2.14.3.tar.xz 1116824 BLAKE2B ca7068a4983e2f7c3694222f6a932d8db132b0a20a50a10415f58a77100a95d8e0fd2e8cf980ece8ef55be0f0ca652cc1a75af62a22b9d60ff19ad4801383416 SHA512 a73160724f944832f915ff29c557e2a968d6c5ae5c4e9759d96444af8841e52a1193d50a74f01deb1ec5ef03b3301897bd85c5ebb82ac22d8188d528629d74d4
-DIST git-htmldocs-2.15.1.tar.xz 1134848 BLAKE2B 1efb6d4ca16779c39be69fed57fccb023ddac6bb9c9727ebd7050eb40035c1d56dbce0191224e8d3370d433d8e1cf210df9bc9bde2effb6fbb2d62bfd5e9e440 SHA512 50e53b506c17b046c42a8d9f888741b1f408fb7bb566d981ad6dcda3383f1d310008732a849b4755e7233dc83477f354e9c6d5d4e1fcf0e81af54d49153e8c34
-DIST git-htmldocs-2.16.0.tar.xz 1159956 BLAKE2B eb38d27ce2de42b18971afbabfef8f6527e3c330cbe841dd0c6f35e821974cc6c6c432e8a55cec19413224b597cd3e37e56ddd039161811cb90809d72a170c99 SHA512 bfc501adb325b8111e327359fe1b7f788f6c6fa459ec2895c2bfc7ab9d794c59eac314504b2336da9d69b6ae6121764e693e8417a26ab5f12cdd485770f88707
 DIST git-htmldocs-2.16.1.tar.xz 1160372 BLAKE2B d426fbc85772e5f04550071dea50a75e6d581fd040e8b37b3b342a8d6569d0dcf456445bab1dec3d84e254e82468c900afff7c6be1ebd6771e7fad5884b92515 SHA512 f2bb8b88ab5aa3d6204874aae583249d5137193c5fe3925df7ae1bcdaec0564b496df9a648c180bebb0c8ff4573f27e330802020d3c9207c2738ddd5c52d99c9
 DIST git-htmldocs-2.16.2.tar.xz 1162556 BLAKE2B 71b71b914b438cb3eee417c5bbcb30faa10b0a154efa378e8e3b5521a4902f26a038ab884ffdac1756d07e3afcaeafe915d6c64f9503ff65f1fa58bbbd7fffde SHA512 adc7a95fc7a7a46c92c8735ad5b89f236905b770fa66682e0234addc2107f46de65724c577c8fc512e13cd8d306fff992ad7c6c495100cb645674604836e0768
-DIST git-manpages-2.13.6.tar.xz 407660 BLAKE2B 76bae6c11cf21f39adf121b4580fe10021e354374e37de6ca5eee6e60e1c7ef3b2dafb086c6b8d88f35216204269945cf45fcd6868f9940d2f00b72a87bad8e2 SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f
-DIST git-manpages-2.14.3.tar.xz 411324 BLAKE2B c896a54305276ff0bb1d860f02833f5902bf869e746333c0598f8c494efb56c65c4a9d5d9eeb54a9a38a6b07776abddc4267b73c2ff020cedf65248ac89afca6 SHA512 3e1215bdc28df84fd26ba40f6aedfa9f2140c170af48148b1b89d28e8b411686376715920f86d9db9aa18f4a3f4e8f68082da7632febbcbc7fc956f32807da50
-DIST git-manpages-2.15.1.tar.xz 413124 BLAKE2B 61407bc2c87fddff7a992c25f71768e39bee56941a7291f8c03ee59d10f7db36259e80c6f85ca0303c5e79edb3e1ff02b4abc6c8577bb1f3072b8a469ca55f23 SHA512 de02606554c14fdb780f2885b8b88e6b15e82e4debe9f59da75d57832a41f688be9882e74eacd0dc36db7a42bfbd88c5168b378ca0c8658317fe68e207ec2d18
-DIST git-manpages-2.16.0.tar.xz 417192 BLAKE2B 43369365cd9c25035d863057aff3909aada3ceac59599132aefc4d7e26933e747c568140fad957822f8a1ef1d3e370dfdaeadbdee12e0e254dbab02888714446 SHA512 00b08b1a3a33af2dd4550225ee03e6efe12eee554f78257cdfd20af7cded64ac11879032384f0ec987c1dc04d18b3007319de9a02fdba183c92cdc382e23e139
 DIST git-manpages-2.16.1.tar.xz 417188 BLAKE2B 239fb33967d17c8b10efb2e0d1963f7be3404b7f262b49f89b3f4a538135d80268fbe7fe0e561c9cb2d86840eb46b61653ed363d8da27d1169c435d8e1d5e851 SHA512 20c7646b5f1e3c633ce6aae5ee5fcbe4ca1e59fc9253ec9a9e45c7cd8a8ac7a5e71e36258eb747e3bd6d51b3b7971137315dcdbdff493e0f8774ecd3e309735a
 DIST git-manpages-2.16.2.tar.xz 416500 BLAKE2B af9ccf18280c23e54e11cf76f891d5613db8c8f9ef84394266ad9c614ddb2181acab4cbb3998b4d5d01aa7b0d8f8cfbe090e77bb5b0297e4a7ed341a8d1fb3de SHA512 38d560955a025761f256e598f87c6b1122b474cc7bfeeee8fffb48b353ab3d8d969f6cd55da326daa61a4079dfd68f931b2e0eae11d6e8d5549e69de17c7f537
diff --git a/dev-vcs/git/git-2.13.6.ebuild b/dev-vcs/git/git-2.13.6.ebuild
deleted file mode 100644
index 12ba009e9ed7..000000000000
--- a/dev-vcs/git/git-2.13.6.ebuild
+++ /dev/null
@@ -1,678 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-# See https://git-scm.com/docs/gitworkflows#_graduation
-# In order of stability:
-# 9999-r0: maint
-# 9999-r1: master
-# 9999-r2: next
-# 9999-r3: pu
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=maint
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-	use elibc_musl \
-		&& myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-r3_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-libsecret failed"
-	fi
-
-	cd "${S}"/contrib/subtree || die
-	git_emake
-	use doc && git_emake doc
-
-	cd "${S}"/contrib/diff-highlight || die
-	git_emake
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-libsecret
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled=""
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.14.3.ebuild b/dev-vcs/git/git-2.14.3.ebuild
deleted file mode 100644
index 70da7ddf2057..000000000000
--- a/dev-vcs/git/git-2.14.3.ebuild
+++ /dev/null
@@ -1,696 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: pu
-	case "${PVR}" in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
-	esac
-fi
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	pcre-jit? ( pcre )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of static build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=" USE_LIBPCRE2=YesPlease"
-			extlibs+=" -lpcre2-8"
-		else
-			myopts+=" USE_LIBPCRE1=YesPlease"
-			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
-			extlibs+=" -lpcre"
-		fi
-	fi
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-	use elibc_musl \
-		&& myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
-			myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-r3_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-libsecret failed"
-	fi
-
-	cd "${S}"/contrib/subtree || die
-	git_emake
-	use doc && git_emake doc
-
-	cd "${S}"/contrib/diff-highlight || die
-	git_emake
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-libsecret
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.15.1.ebuild b/dev-vcs/git/git-2.15.1.ebuild
deleted file mode 100644
index 67a7f811554e..000000000000
--- a/dev-vcs/git/git-2.15.1.ebuild
+++ /dev/null
@@ -1,696 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: pu
-	case "${PVR}" in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
-	esac
-fi
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	pcre-jit? ( pcre )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of static build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=" USE_LIBPCRE2=YesPlease"
-			extlibs+=" -lpcre2-8"
-		else
-			myopts+=" USE_LIBPCRE1=YesPlease"
-			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
-			extlibs+=" -lpcre"
-		fi
-	fi
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-	use elibc_musl \
-		&& myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
-			myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-r3_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-libsecret failed"
-	fi
-
-	cd "${S}"/contrib/subtree || die
-	git_emake
-	use doc && git_emake doc
-
-	cd "${S}"/contrib/diff-highlight || die
-	git_emake
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-libsecret
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.16.0.ebuild b/dev-vcs/git/git-2.16.0.ebuild
deleted file mode 100644
index 67a7f811554e..000000000000
--- a/dev-vcs/git/git-2.16.0.ebuild
+++ /dev/null
@@ -1,696 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: pu
-	case "${PVR}" in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
-	esac
-fi
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	pcre-jit? ( pcre )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of static build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=" USE_LIBPCRE2=YesPlease"
-			extlibs+=" -lpcre2-8"
-		else
-			myopts+=" USE_LIBPCRE1=YesPlease"
-			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
-			extlibs+=" -lpcre"
-		fi
-	fi
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-	use elibc_musl \
-		&& myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
-			myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-r3_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-libsecret failed"
-	fi
-
-	cd "${S}"/contrib/subtree || die
-	git_emake
-	use doc && git_emake doc
-
-	cd "${S}"/contrib/diff-highlight || die
-	git_emake
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-libsecret
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild
index edc3c1e16def..5f587fc48aff 100644
--- a/dev-vcs/git/git-2.16.1.ebuild
+++ b/dev-vcs/git/git-2.16.1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~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"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/mercurial/mercurial-4.5.2.ebuild b/dev-vcs/mercurial/mercurial-4.5.2.ebuild
index c7173fdd6f71..6f7dff306aea 100644
--- a/dev-vcs/mercurial/mercurial-4.5.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.5.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/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
index fce20acdbc03..be910a8ebbf5 100644
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~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 ~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="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND="
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index b4a6186856be..d4c56be6b46d 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b381c28495cb..2517d3992dde 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt5-build.eclass
@@ -13,7 +13,7 @@
 # Requires EAPI 6.
 
 if [[ ${CATEGORY} != dev-qt ]]; then
-	die "qt5-build.eclass is only to be used for building Qt 5."
+	die "qt5-build.eclass is only to be used for building Qt 5"
 fi
 
 case ${EAPI} in
@@ -57,15 +57,14 @@ esac
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit estack flag-o-matic ltprune toolchain-funcs versionator virtualx
+inherit eapi7-ver estack flag-o-matic toolchain-funcs virtualx
 
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
-SLOT=5/$(get_version_component_range 1-2)
+SLOT=5/$(ver_cut 1-2)
 
-QT5_MINOR_VERSION=$(get_version_component_range 2)
-QT5_PATCH_VERSION=$(get_version_component_range 3)
-readonly QT5_MINOR_VERSION QT5_PATCH_VERSION
+QT5_MINOR_VERSION=$(ver_cut 2)
+readonly QT5_MINOR_VERSION
 
 case ${PV} in
 	5.9999)
@@ -147,15 +146,6 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
-	if tc-is-gcc; then
-		local min_gcc4_minor_version=7
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
-			eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
-			die "GCC 4.${min_gcc4_minor_version} or later required"
-		fi
-	fi
-
 	# bug 307861
 	if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then
 		eshopts_push -s extglob
@@ -330,7 +320,9 @@ qt5-build_src_install() {
 	fi
 
 	qt5_install_module_config
-	prune_libtool_files
+
+	# prune libtool files
+	find "${D}" -name '*.la' -delete || die
 }
 
 # @FUNCTION: qt5-build_pkg_postinst
@@ -552,6 +544,24 @@ qt5_base_configure() {
 		-examplesdir "${QT5_EXAMPLESDIR}"
 		-testsdir "${QT5_TESTSDIR}"
 
+		# force appropriate compiler
+		$(if use kernel_FreeBSD; then
+			if tc-is-gcc; then
+				echo -platform freebsd-g++
+			elif tc-is-clang; then
+				echo -platform freebsd-clang
+			fi
+		fi)
+		$(if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
+			if use kernel_linux; then
+				if tc-is-gcc; then
+					echo -platform linux-g++
+				elif tc-is-clang; then
+					echo -platform linux-clang
+				fi
+			fi
+		fi)
+
 		# configure in release mode by default,
 		# override via the CONFIG qmake variable
 		-release
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 03e44c420046..b07a27f96bf3 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -184,7 +184,7 @@ fi
 
 if in_iuse graphite ; then
 	if tc_version_is_at_least 5.0 ; then
-		RDEPEND+=" graphite? ( >=dev-libs/isl-0.14 )"
+		RDEPEND+=" graphite? ( >=dev-libs/isl-0.14:0= )"
 	elif tc_version_is_at_least 4.8 ; then
 		RDEPEND+="
 			graphite? (
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index a941afbb86b3..b32c4e3d7e1a 100644
Binary files a/gnustep-apps/Manifest.gz and b/gnustep-apps/Manifest.gz differ
diff --git a/gnustep-apps/pikopixel/Manifest b/gnustep-apps/pikopixel/Manifest
index ead112bb98b5..c2e4b10726d2 100644
--- a/gnustep-apps/pikopixel/Manifest
+++ b/gnustep-apps/pikopixel/Manifest
@@ -1,3 +1,3 @@
 DIST PikoPixel.Sources.1.0-b7.zip 944683 BLAKE2B 18fada4f29b34f22ac4b263de9cc8621e904ee2ebf0da8826e681960c93aa4b85d6841843a6f7f8650fc8147187b7ef30cbfa74375488feb86bf2bda901d8385 SHA512 e1f2d30dc7a07e0dab5e78a88568816475060d2aac1676782a5aed2fd6037b8e3284196050fb496c6d09bfe8f6445bc6c6c1eab1145679616f2cd68ad56b03aa
 DIST PikoPixel.Sources.1.0-b8.tar.gz 538896 BLAKE2B 0ee4a75f62f6e5b20910bebadc856a095f06c6006bfd4cba84b7beb91a3d71a6cd3114647be8f45860b28d5638d611de91293bb969ed694e261fa447d2882620 SHA512 a106dc3443fef8f569633722c837a876b609c9bec7edda8189c5b6a6388fc4edeeb5eedaa9d72e3a89d13a74dd57c86184983cc10d7b8075b7284b8814e96784
-DIST PikoPixel.Sources.1.0-b9.tar.gz 553186 BLAKE2B a774b96a60855c93f78d2c545fb256e12c47fc144b0a514209a4c822a47821db6c40348d8a8a46481386e21848dd468a76fd76bfc33e6a605499b2acae38a773 SHA512 ad7120080d77a3d05f9d0ad19bccdc2853c97951ce3b96f5ec91eeee12ee8e7ea41209fd4d59203f28191098cb5225abfccb2f5b7824a1cbd3ce39029b197fc6
+DIST PikoPixel.Sources.1.0-b9a.tar.gz 553753 BLAKE2B 18ab3159c29ba46850a7eee3d5bf45e63f0f2a66270b61141a13ff7fbdf8b9e988979388d608995fc9b8fc089ed2beeafe838db82e16756726422b2ce641bb4a SHA512 03cc3d6dccc26986aeac95074b6cac47d9d5c087c5b3e742409ec41297f634649bcfd4f2d76118e49c95499e1b75dab97e81951ae1186449707c8634ab1519fe
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta9.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r1.ebuild
similarity index 93%
rename from gnustep-apps/pikopixel/pikopixel-1.0_beta9.ebuild
rename to gnustep-apps/pikopixel/pikopixel-1.0_beta9-r1.ebuild
index 7684db1aee02..f4ecbb903ae2 100644
--- a/gnustep-apps/pikopixel/pikopixel-1.0_beta9.ebuild
+++ b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit gnustep-2
 
-MY_P=${PN//p/P}.Sources.${PV/_beta/-b}
+MY_P=${PN//p/P}.Sources.${PV/_beta/-b}a
 DESCRIPTION="a free application for drawing & editing pixel-art images"
 HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
 # Web hosting wants a proper User-Agent
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 57389c966aae..f7a62d0c5ce2 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/ark/ark-17.12.3.ebuild b/kde-apps/ark/ark-17.12.3.ebuild
index c95527b9545e..eb5ba8737873 100644
--- a/kde-apps/ark/ark-17.12.3.ebuild
+++ b/kde-apps/ark/ark-17.12.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Archiving tool"
 HOMEPAGE="https://www.kde.org/applications/utilities/ark
 https://utils.kde.org/projects/ark/"
 KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 lzma zip zlib"
+IUSE="bzip2 lzma zip"
 
 RDEPEND="
 	$(add_frameworks_dep karchive)
@@ -35,7 +35,7 @@ RDEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	app-arch/libarchive:=[bzip2?,lzma?,zlib?]
+	app-arch/libarchive:=[bzip2?,lzma?,zlib]
 	sys-libs/zlib
 	zip? ( >=dev-libs/libzip-1.2.0:= )
 "
@@ -52,7 +52,6 @@ src_configure() {
 		$(cmake-utils_use_find_package bzip2 BZip2)
 		$(cmake-utils_use_find_package lzma LibLZMA)
 		$(cmake-utils_use_find_package zip LibZip)
-		$(cmake-utils_use_find_package zlib ZLIB)
 	)
 
 	kde5_src_configure
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 32bc05f344f2..d88f04499b4a 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 76834a8c4030..a404340a9ea6 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,3 +1,2 @@
-DIST attica-5.40.0.tar.xz 60612 BLAKE2B c9b251b01ed6215f5f16be2956cde75b1cc09632d7072b5d38ec1a983d13777d6a1e67df5fb171849f8596134e385b22508d37dd63ecc8be0fdef74fb6db1ad3 SHA512 860a33820f3ad44b079bbd1c72a5dd751bb7b23ac26f729a72241dac5167fa63f43c9184c07494036ae2a0a39819afd24094c18c18fbc330e9b3679c1eaca5ff
 DIST attica-5.43.0.tar.xz 60480 BLAKE2B dd6ebebd56d83a494099b7c6f91b1de3b92752a536a01007aed399a22a3d6e60a31c7807475cd76658f0d0ad069467b826c80b2d6ffe0d717db512aa67567627 SHA512 1584c7f121c4e5092e1f694d0ebed1ac2b31a3a7ce5ee9330ee00852a470266011d3e076da3174b3f37207aad93dd2070fcee9384e466afe202d8e5175fb81e1
 DIST attica-5.44.0.tar.xz 60492 BLAKE2B 7f31617b7994f2fd366ee8012871213fc3c2c6611741ab90fa1873f5f991068dd8fc80f4439132f733c8c0cd3f37277e44895c9e6e8d0dc25cc3d2abd4850038 SHA512 49e24dec14a85a2ba1a9603919afeafb916231dea95c2597d02a0f78d2aec1f6759ddb97adf023a89221b9ebb593aca4c3bac0defff3aecbccfe26e162089860
diff --git a/kde-frameworks/attica/attica-5.40.0.ebuild b/kde-frameworks/attica/attica-5.40.0.ebuild
deleted file mode 100644
index 763b6f7a386f..000000000000
--- a/kde-frameworks/attica/attica-5.40.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtnetwork)
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/attica/attica-5.43.0.ebuild b/kde-frameworks/attica/attica-5.43.0.ebuild
index d88c4abe8dfe..430e1916761d 100644
--- a/kde-frameworks/attica/attica-5.43.0.ebuild
+++ b/kde-frameworks/attica/attica-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing access to Open Collaboration Services"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 9b0e5be321e6..5bb7b2d080d8 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,3 +1,2 @@
-DIST baloo-5.40.0.tar.xz 198976 BLAKE2B 55411bca6ad06e4267f7421a3f75b62bf144bba51e4198127a393d19b86bff8b4bdcdd3634cc0b37d93f18d2eaebdf2c21d3af297878fe7fd2a9614a70fbe86e SHA512 5853246ac632ef6e528956d35e4b0a0321dd62e266e6e7f4f6c3be2ef1650191dacd248cfdc1b7cdc35f6d6eb0e4cb763a8336d5bde9329fbb27ca4f2a0b7e50
 DIST baloo-5.43.0.tar.xz 207280 BLAKE2B 3ab5b9045e5784ad7cc3ee1c65d29cde410eeb73c81d81d42328986b577603f36f09206a1df5f4bdedd5ac2804fb73c951950124a8ea6eb068fde86ca5c19cb9 SHA512 918d615adc07ee71414eabe15cd18f3cfee264c206cbef32f6807cff2eac701a58ae7eebb087e618e9bc7741ad8409514af8361e216ff68b07b65dd0da0a802a
 DIST baloo-5.44.0.tar.xz 209876 BLAKE2B 5b3770228ee345a6c9ae59c7dfa51a443c2919b7ac11cec69cb6d831d26b48cf2e75ed5d070f878df751e2dc685944e41934d595ae64fa9931269bbdb89cc30a SHA512 50bf540b74e092f035cade507c6964bd9f5a3f409a0a1eb6c81b78866c7cbadf5a7b4301a78acd3d9ce86144d75c87cc10ac3551956bfb460dfa45fcd2e2181d
diff --git a/kde-frameworks/baloo/baloo-5.40.0.ebuild b/kde-frameworks/baloo/baloo-5.40.0.ebuild
deleted file mode 100644
index e278eb9c2e9c..000000000000
--- a/kde-frameworks/baloo/baloo-5.40.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for searching and managing metadata"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-db/lmdb-0.9.17
-"
-RDEPEND="${DEPEND}
-	!kde-frameworks/baloo:4[-minimal(+)]
-"
-
-RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/baloo/baloo-5.43.0.ebuild b/kde-frameworks/baloo/baloo-5.43.0.ebuild
index 564ee8abea0d..463162432923 100644
--- a/kde-frameworks/baloo/baloo-5.43.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.43.0.ebuild
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for searching and managing metadata"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index a90beee9d244..0a071ec7114e 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,3 +1,2 @@
-DIST bluez-qt-5.40.0.tar.xz 75084 BLAKE2B abc377c66b04f509e8566554e35333f4a55c68d5ef623e29473d77a1ee564de340d7b434fafe634c8e9f15b86c5b8456533915d960630eeace4761b38a0093f1 SHA512 72743afb56b9d393b9ef6d03c42869a416feca3f543ef6d8b6aef9be23203fe8d28a2371d9d79a3a2ebb6e48a2ddce63b7010dfe736c8e3e4e706be84d12a09e
 DIST bluez-qt-5.43.0.tar.xz 74944 BLAKE2B abd1efa02801b8a2cf90a28224a340c4ce58911cebfd90a5285b19db7812b755049ae6dcaa41e4a86133e64ba5d0cbde4c7317ef49a86cd114b742296f0d5c1b SHA512 0c1105f167ddcbc0f398a8f48b68c45f7f36520abf400dbe01ded84151e6553f24cbc4a660db8999fc4c16b018873ec2b0a4c4b21e01dfb3851f64e7a6806cbd
 DIST bluez-qt-5.44.0.tar.xz 74940 BLAKE2B 5804179db3948c568a0961e9bb8c742f536e539ef3ed4d740a301ac853d209e075a31b61a0629be00414a4374db3e4bf82de54ef93a20adef997a07492b13f7f SHA512 3a2c5418f353527604af496c1d4fa0c5790e834577e6463ab3357330ba92343c94b9ef5dc4a8baaa80987968bd0f3d703153e9f3e955eb64bd175f3a9ead7f7f
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.40.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.40.0.ebuild
deleted file mode 100644
index a0974c77ae28..000000000000
--- a/kde-frameworks/bluez-qt/bluez-qt-5.40.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5 udev
-
-DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtnetwork)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# bug: 609248
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.43.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.43.0.ebuild
index adc7a124e0af..dcbefb57a0ac 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.43.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5 udev
 
 DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 5729af7bebe5..fa10b9cf852a 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,3 +1,2 @@
-DIST breeze-icons-5.40.0.tar.xz 1498952 BLAKE2B f6da50e392b2cfb2a2de1207b07d24ab6c0f93aac31dd9a21e82d6d00cce920577e6e90fdc3fb7778a62fcf3b4cf511672c9c434bf84fcb39c3bf0eb13e42d5a SHA512 d24fe6eb77bbb4a37c128cc31a2a30c7257304ffa2fc48130fe4bfb5d117108f08510113b0328cc0b5edc5de9bb3fffd4f63431583bdc62513249c9096421263
 DIST breeze-icons-5.43.0.tar.xz 1526628 BLAKE2B 230a91698dd2ce00e19cb4fa374c3a173559c09d35de287c21d19d2b6ef1f7b49e2964460d2b27574cec5d7b959da5334f6bc2ea3cb90f6e9b20a2c28d4ce72e SHA512 ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78
 DIST breeze-icons-5.44.0.tar.xz 1532004 BLAKE2B 4ba1db490b325cd86a3bc0c59fda65bc21a797f29c2e1c5d952820c111d4d7148cde415a29d35dd44b713f98309aa27678bfe63657cba1552b54fb69202990fc SHA512 2303c06f77d0e13fddbc70f039301f3e19956c27559f9dcc50c4ef5ed54d750c1c589fb0c329cf344af6df689d2efbc6578f8d6be5eb37760bc64d64f6eb2b45
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.40.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.40.0.ebuild
deleted file mode 100644
index 2afcfba49858..000000000000
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.40.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KMNAME="breeze-icons"
-inherit kde5
-
-DESCRIPTION="Breeze SVG icon theme binary resource"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	test? (
-		$(add_qt_dep qttest)
-		app-misc/fdupes
-	)
-"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINARY_ICONS_RESOURCE=ON
-		-DSKIP_INSTALL_ICONS=ON
-	)
-	kde5_src_configure
-}
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.43.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.43.0.ebuild
index 93736a98856c..dafd93539d98 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.43.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.43.0.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Breeze SVG icon theme binary resource"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 5729af7bebe5..fa10b9cf852a 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,3 +1,2 @@
-DIST breeze-icons-5.40.0.tar.xz 1498952 BLAKE2B f6da50e392b2cfb2a2de1207b07d24ab6c0f93aac31dd9a21e82d6d00cce920577e6e90fdc3fb7778a62fcf3b4cf511672c9c434bf84fcb39c3bf0eb13e42d5a SHA512 d24fe6eb77bbb4a37c128cc31a2a30c7257304ffa2fc48130fe4bfb5d117108f08510113b0328cc0b5edc5de9bb3fffd4f63431583bdc62513249c9096421263
 DIST breeze-icons-5.43.0.tar.xz 1526628 BLAKE2B 230a91698dd2ce00e19cb4fa374c3a173559c09d35de287c21d19d2b6ef1f7b49e2964460d2b27574cec5d7b959da5334f6bc2ea3cb90f6e9b20a2c28d4ce72e SHA512 ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78
 DIST breeze-icons-5.44.0.tar.xz 1532004 BLAKE2B 4ba1db490b325cd86a3bc0c59fda65bc21a797f29c2e1c5d952820c111d4d7148cde415a29d35dd44b713f98309aa27678bfe63657cba1552b54fb69202990fc SHA512 2303c06f77d0e13fddbc70f039301f3e19956c27559f9dcc50c4ef5ed54d750c1c589fb0c329cf344af6df689d2efbc6578f8d6be5eb37760bc64d64f6eb2b45
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.40.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.40.0.ebuild
deleted file mode 100644
index a8e37330fae0..000000000000
--- a/kde-frameworks/breeze-icons/breeze-icons-5.40.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Breeze SVG icon theme"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	test? (
-		$(add_qt_dep qttest)
-		app-misc/fdupes
-	)
-"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINARY_ICONS_RESOURCE=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.43.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.43.0.ebuild
index f35c78d7beb2..c05b62b321bb 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.43.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.43.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Breeze SVG icon theme"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 3cde05475312..ccde81f79ab2 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,3 +1,2 @@
-DIST extra-cmake-modules-5.40.0.tar.xz 312532 BLAKE2B 0054ee4d3d17f238c4940404c6f5e00c951d305b0fce3e206bdc84dff0be683d4dc7e7043db61019422d182385ec2990e05b2df384b14e7b248d492cf918e691 SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c
 DIST extra-cmake-modules-5.43.0.tar.xz 314064 BLAKE2B b1866e66c2d12d450aada3f5dca86bf1638906cb3f4a2aa36dea43d3d0b2edde5cba85caa6ca7e0f6bd007733db16f88c2108103b588d637f1001f711037561b SHA512 fcdd96ad0db73f75708fdc97bbc74e28ef271a5dc27d8730f57efaf9e451ed5aaa51d20831c3cf20c82d377d50d51ba4abbfd09cdfbf02998396f907f6fa9cc5
 DIST extra-cmake-modules-5.44.0.tar.xz 314212 BLAKE2B 67d6a732139937aac95c79bdbf66e33ba7695465f1608e556456f916ced7dadb80b97a928841f18a804a933228b4451e34e5765921440137c798b4ba5bdfbb3e SHA512 02b9dd0bc2a90b6f1973a9914b1f40a331fdaed0f004a732eb197e6ba5266b78bcb51ede3dab042c86c2db76c61bf8b9e8ccf71be27a5dbdaeed4c4fb0a365c9
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild
deleted file mode 100644
index 9e3b717fdaf6..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5 python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-	test? (
-		$(add_qt_dep qtcore)
-		$(add_qt_dep linguist-tools)
-	)
-"
-RDEPEND="
-	app-arch/libarchive[bzip2]
-"
-
-PATCHES=( "${FILESDIR}/${P}-qmlplugindump-path.patch" )
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HTML_DOCS="$(usex doc)"
-		-DBUILD_MAN_DOCS="$(usex doc)"
-		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
-	)
-	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# ECMToolchainAndroidTest passes but then breaks src_install
-	# ECMPoQmToolsTest is broken, bug #627806
-	local myctestargs=(
-		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild
index 8b14f01dc797..dc003c96c9fb 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
deleted file mode 100644
index a5b12aac3579..000000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 099fc991b85e91aa4bbfd20ba005f0c3a0002f97 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed, 31 Jan 2018 15:32:46 +0100
-Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump
-
-Summary:
-Without any hint, qmlplugindump version is whatever default is set by qtchooser.
-Fix uses the same approach as FindQtWaylandScanner.cmake.
-
-Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami.
-
-Reviewers: apol
-
-Subscribers: aacid, dfaure, cgiboudeaux, #frameworks, #build_system
-
-Tags: #frameworks, #build_system
-
-Differential Revision: https://phabricator.kde.org/D9116
----
- modules/ECMFindQMLModule.cmake.in | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 428d60a..8109ab8 100644
---- a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -26,8 +26,11 @@
- #=============================================================================
- 
- include(FindPackageHandleStandardArgs)
-+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
- 
--find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
-+query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+
-+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
- if(NOT QMLPLUGINDUMP_PROGRAM)
-     message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
- endif()
--- 
-2.16.1
-
-From 3e3ac52aef1bbe22d293a05253c69b755f59428c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed, 31 Jan 2018 15:58:10 +0100
-Subject: [PATCH] FindQtWaylandScanner.cmake: Use qmake-query for HINT
-
-Instead of hardcoded /usr/lib, same solution as in D9116
----
- find-modules/FindQtWaylandScanner.cmake | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake
-index 79a1b05..37ebbdb 100644
---- a/find-modules/FindQtWaylandScanner.cmake
-+++ b/find-modules/FindQtWaylandScanner.cmake
-@@ -86,11 +86,14 @@
- #=============================================================================
- 
- include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
-+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
- 
- ecm_find_package_version_check(QtWaylandScanner)
- 
-+query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+
- # Find qtwaylandscanner
--find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
-+find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS ${qt_binaries_dir})
- 
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(QtWaylandScanner
--- 
-2.16.1
-
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 67907597e9c4..d5df26e13b64 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,3 +1,2 @@
-DIST frameworkintegration-5.40.0.tar.xz 1752732 BLAKE2B 8c5e10a9a295ec89092fcba9fbc6ecaa715fdb5a681e351ef46ce23e6600b665b3d46047774e325c642cdc7de950a2dc32a06e4bdb1f417c8791ae0dfadf8231 SHA512 2ef108ca6738c4f9f9d164bd79449a4baaf9d343916f9fad98925ea0bb1ac5bed57fbe239f2ae8d1ab8ecf251dc3329e7e96ce0f9c55e607d0bbf5c59c697e28
 DIST frameworkintegration-5.43.0.tar.xz 1753176 BLAKE2B bb25f629cf5f7c27f452a958dff06b3cb099c84e5e45188cc99dd1cea125814a995db7b8f0356a3c4712d56038e7c319c453db116add146d4894617db7ee2b72 SHA512 f313fc3c0e16f877312f0c8e64e28c9368ef93fdafde1d6d3fa4f972290643139cdeb6a7376b57596042e4aaae0a87c9c9dad68ae895cb227d709a58ecbe7960
 DIST frameworkintegration-5.44.0.tar.xz 1753184 BLAKE2B 02370a9509d27c35f610cb128306c0d73413e124ebb056059a321bd7696cb92fb260c472e0c3c448c80b2ee3507e3e6db5a59e5910a6a482c9676f9d8617bd09 SHA512 a24caa4e3cad039268fd1179d25d2887d3f1a861159bb9187c555238ad937f6584f592044fbb4af6a677611a904cfc363e2e2225f2feef93773be374abbfb31b
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.40.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.40.0.ebuild
deleted file mode 100644
index ed5617e786b0..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.40.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="appstream X"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	appstream? (
-		app-admin/packagekit-qt
-		dev-libs/appstream[qt5]
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_prepare() {
-	punt_bogus_dep Qt5 DBus
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package appstream packagekitqt5)
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.43.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.43.0.ebuild
index b6c0da034de8..04b69ccd307e 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.43.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="appstream X"
 
 RDEPEND="
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 07fcf7ca64fd..57f1a5334799 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,3 +1,2 @@
-DIST kactivities-stats-5.40.0.tar.xz 60896 BLAKE2B 41c94737d80e5c84bd75813573ec6b150e63e3e7f811f01e8651f14fdca3547398641496eff393fc77326a2f8b867b1a27d7a956723fef073800535c287da39b SHA512 1c5285038247dd778579daef2b4bc4663b67a18364670ef953c52311931e0f1c5147bba2f699a316be52a41d641ee7b9db4fd78c6f96db47883c95a442ecd907
 DIST kactivities-stats-5.43.0.tar.xz 60896 BLAKE2B da72c4f274bf54f1e8619f1a2c0a4b18cf15b3785f8899a6300c317d142dd2f5b15dcc7898a87b2e19aee9bb9761d1e521762772c26274199a63553905992561 SHA512 777b94ff72504904d36e5e9a9a3c85bb3088379aa860c8e6ada4db20c44aa57c9c123ce2638b7126a3c57958f170272494ef99f3d8fedf0e4cb4b23e2a113546
 DIST kactivities-stats-5.44.0.tar.xz 60872 BLAKE2B de526799e1f9d96237ce3ceb3e246fc9193c636280320785c9267fa539e0f99eba941e391450c367b9681cc7df239b560258b0b917f2f0a617c2e87f18fe2f8e SHA512 accf92136d9ab9255d3bde0aef93fd9254ed231e907114633c77f634fa5ffe9062b85d7c56e5cd1e16a4747134e01e7621d8d1e43ba837472667df0136984998
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.40.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.40.0.ebuild
deleted file mode 100644
index d7d248183c30..000000000000
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.40.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtsql)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.43.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.43.0.ebuild
index 2c93cf434f2f..4d022b5365b6 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.43.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 4344a1c811fb..cc4e26eb17d1 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,3 +1,2 @@
-DIST kactivities-5.40.0.tar.xz 61272 BLAKE2B a21e9858572be9ec8e6d09bb46213cd42ed33925ed0f527290a0ac232d3594ab5d0f8d66ed3764cb2e4440e06f57f002ef7ec7939d1fe98c2846c1516e7766f5 SHA512 030c3678c2971c9d499c9cdb863363ae82e35295d88aec141149988aa1596996cf0a32863db6024ac2ed15879d8edc5feef4b72ee89d2efe5641b33690ecfbce
 DIST kactivities-5.43.0.tar.xz 61328 BLAKE2B f5be8fd23dae3de0b675dec2fec72120805452df36fbbd1f530c26eea29823d14dee347e4f3ef4daa588fe3d2ced0d0e89bb609efd0fe29323183cdb613dec91 SHA512 121a3704558bdc8fc4e71519face18593800a549b2cffff1919ccb0255a29d24075523e96ca3bdf7c999b0dca1dd8b30609b3db7e7538c94f550bb7d69f17c19
 DIST kactivities-5.44.0.tar.xz 61328 BLAKE2B 999944d90437672c4141d973a3b641d64cd3fb7afe42c4cb0301a6f1fc9688cb31c0ea383580e10423b2ddfd851de4ab70ef31070f370041177e4de34990047e SHA512 2b988cfbadbcade024ef8886bd8394c9b6bc6929909c88b4c8a494887d0918e6bf804c93929bb676b7cdf990b34975d246e6435ef7435e97265eda1ca86d12a8
diff --git a/kde-frameworks/kactivities/kactivities-5.40.0.ebuild b/kde-frameworks/kactivities/kactivities-5.40.0.ebuild
deleted file mode 100644
index c9288bba6565..000000000000
--- a/kde-frameworks/kactivities/kactivities-5.40.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for working with KDE activities"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative widgets)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kactivitymanagerd)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities/kactivities-5.43.0.ebuild b/kde-frameworks/kactivities/kactivities-5.43.0.ebuild
index 9bc7ca2a1803..36e98fcbd631 100644
--- a/kde-frameworks/kactivities/kactivities-5.43.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for working with KDE activities"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index b61a3a154a15..eac946a73dc2 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,3 +1,2 @@
-DIST kapidox-5.40.0.tar.xz 395756 BLAKE2B 89adbf55ce32a0a1960ffbfa7e4055ac57826beeb8a8a370f3e283892efb54ed53171c119907bfcae7976605b198ab66d523c5c039ea601ab77bd374d2359220 SHA512 267d96b874f51da99f10a220601128112c7907da2be317d0acbaed5be0530414762e8aeeff9560696e22b357cb3c95c3427d83b951217fcb34088f0b473926be
 DIST kapidox-5.43.0.tar.xz 395592 BLAKE2B 32fff6c9b714c7d3f8f62d8e165fc4ba307ffcb22144886c1cf5d2b0385ab00c7b4feac3bbdccd3b6e7c37dd527406c88ef160775457923af51ee94f54b9f7d6 SHA512 08dc74e70d3d8c36411590ecbb2ae1a014f2029e0bb4cb4bb066e18e7a33f9acdfeccd6d9def2127dbcdcd40af8c3c676f4deb050c845ab8ca4789d8ea35abf8
 DIST kapidox-5.44.0.tar.xz 395668 BLAKE2B e1f1a347c6cd2680a03b2eb05aa907e78e4ce4ed9b65ac7b846de1b85c7ccdc532bd1ab9b64515f7a78e9f1cc26c75a1845be5ddc0695f5a3f7f1d4f2ea02dbc SHA512 504e09020bf2a51bf0ba2bcc7f5b47b34fe744975146700923587ec9b362d6c446281dde6d5e9863091991532829b088ff56f4e93d505f7f77b54066ab44398f
diff --git a/kde-frameworks/kapidox/kapidox-5.40.0.ebuild b/kde-frameworks/kapidox/kapidox-5.40.0.ebuild
deleted file mode 100644
index 8d8d0e86c3e5..000000000000
--- a/kde-frameworks/kapidox/kapidox-5.40.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_TEST="false"
-DISTUTILS_SINGLE_IMPL="true"
-PYTHON_COMPAT=( python2_7 )
-inherit kde5 distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	media-gfx/graphviz[python,${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
diff --git a/kde-frameworks/kapidox/kapidox-5.43.0.ebuild b/kde-frameworks/kapidox/kapidox-5.43.0.ebuild
index c0551adddf60..973538c40a02 100644
--- a/kde-frameworks/kapidox/kapidox-5.43.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.43.0.ebuild
@@ -12,7 +12,7 @@ inherit kde5 distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index e4d4dfa4970a..5e274313c264 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,3 +1,2 @@
-DIST karchive-5.40.0.tar.xz 113576 BLAKE2B 92d90369c8ccaa819e1e78efabf7b7bf634de15281f5c0b78be084dea967bacf4a8102de3eb40673681860938c8cace0b96749f5f8f65f4b570b7cc93f250a7e SHA512 edffe71f985b0d7c6cc84d6549447734c717de9f8be4685badee47d94464cf29373cfbfc3662d81c9e0071321c50c4459840c316c08144972e1fab1c295d8a22
 DIST karchive-5.43.0.tar.xz 113496 BLAKE2B 1147dceb139720b3b5954d36f6cfbc971cbde8e52056f2f1d39f83e254695164c4205a8c38b1bf34f7432413201b28946ac5fbfbc8393c0400e84957e439a34c SHA512 228516471fc9e961f68b77d06b55d640606f5adaaa1dcba67d12086d57a3184c87a5d9636085b00bc56007cee1af9863e213bc82317b3c917737de4a3d84c74e
 DIST karchive-5.44.0.tar.xz 113480 BLAKE2B a5a892248cdf0368cf6b6c0c728a1dcb31747bfc7d7c84f149a64302faebd2668cdd48666e6020cdcff77d6829972c4072207101581fdbdf0860cedbf905d3ce SHA512 9476493f310c4ef66df18bb5b7832319b2f2ab9d6a5e4ae27b373119113e40339ffe53c6751ca983a7629703f8bbf519118ba1374b2968149e42bcf798a94558
diff --git a/kde-frameworks/karchive/karchive-5.40.0.ebuild b/kde-frameworks/karchive/karchive-5.40.0.ebuild
deleted file mode 100644
index 3dd9a593ecca..000000000000
--- a/kde-frameworks/karchive/karchive-5.40.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+bzip2 +lzma"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/karchive/karchive-5.43.0.ebuild b/kde-frameworks/karchive/karchive-5.43.0.ebuild
index 2a172249f306..3c35f30e0c18 100644
--- a/kde-frameworks/karchive/karchive-5.43.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+bzip2 +lzma"
 
 RDEPEND="
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index d0e384e85182..5295a9de2a46 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,3 +1,2 @@
-DIST kauth-5.40.0.tar.xz 84900 BLAKE2B f0445740ec66abdde52839f84f7eb709f926ff1e678de8a0f0a5ee7e0c88f8c724255fe46a5281d1c9b3f4591eef6d210881147e3b81b5f64fe82ccd958b427f SHA512 912e45a18f98086a35caf7b65316e4fe0defbbcc80f334bcdfd146a398cfb40abe2aa6b358d2057d457a51ba9fb61b05b1319ca3ff00edea82014919f632116a
 DIST kauth-5.43.0.tar.xz 84844 BLAKE2B 774e2c32e71ea63908a854e6fa8c4f630ebc36b4b6eb0ce8fdbde5004b3f8926f3a60c889461e89dbfc8c00350d2556add8f5e54b8f07f09e7719a13fe7ffd6a SHA512 e20f2f911084f48e81f85f4bc0e4559ce87c476a9dcaacba1e1f4db47ac0b0b3cbd01b185fba0817037838b6fae0e80abea1bc0ab72ced23a2c58fb95f9eb681
 DIST kauth-5.44.0.tar.xz 84832 BLAKE2B 9df7248f31f2c836b09af9f92c36991dc87294ce9e6fed7d0d51095a93fe5744ff4a333ed6d13f37896e6507f52ccb1036c2b34f498ba375e22cd4a510f724a9 SHA512 29a8c7ba1818efd2e36f1852b5c443480ef4e574f05c9c745909de1e37086c0e490d04b6e659edca8fb6d5c9d7140c2abb56386c5aa5caf8b20fc27f0a042748
diff --git a/kde-frameworks/kauth/kauth-5.40.0.ebuild b/kde-frameworks/kauth/kauth-5.40.0.ebuild
deleted file mode 100644
index 89eec2e8044e..000000000000
--- a/kde-frameworks/kauth/kauth-5.40.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework to let applications perform actions as a privileged user"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls +policykit"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	policykit? ( sys-auth/polkit-qt[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package policykit PolkitQt5-1)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kauth/kauth-5.43.0.ebuild b/kde-frameworks/kauth/kauth-5.43.0.ebuild
index ee6570cb1d6b..68d827a029ea 100644
--- a/kde-frameworks/kauth/kauth-5.43.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework to let applications perform actions as a privileged user"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls +policykit"
 
 RDEPEND="
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index fd329018dd45..d8e8c3aea32b 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,3 +1,2 @@
-DIST kbookmarks-5.40.0.tar.xz 117596 BLAKE2B 0ab2956369d9b76a02ae1824c064a5e3cc7c0e92b35376dd6205b3af09a1ac958e366a82d5ad41d9afc932c4ecd81fd9d29c386285988bbb64676b8129db3549 SHA512 b9adaab77f3104ffb0f470ccae25db75b1e73f54bbf49a5b8bdb7bf1271911c8a296cf68d1dc17a0b3e44e9fccc11e44ef2c90d2f03bd504488e2b6a832c097d
 DIST kbookmarks-5.43.0.tar.xz 118672 BLAKE2B 513fc8964913bd4cf3e0587c8afc3ba1ce017c2c93ad4c53048995cdc3cfc9d443faff5c7e5a4efc48215134955cfcc4d20d838ce1ac33f641109329d6858952 SHA512 5cfd55d94efa69267dd1e61e857fa541cd0c7ae55a02d83e91a9a0a02dfa020cfeb16b0a8cc10228f838c17de5bca95f683f445749263fc0e28bc55e2ac6f2bf
 DIST kbookmarks-5.44.0.tar.xz 118636 BLAKE2B 6224425cb649a3ab990894e2bf9479ac1bb82726ab91714340a4e5bf9ca6132740b92ec91dbb8ecd50b3aa940abdb1b9c17817ee00fcf4d3af68d2954f16b22d SHA512 acbe59f40292c05ca70719bfcaa13a87efadc1eab461f7b3332b2385b3246b7f852012db3cce99fd0ef3a97ce95e7616eb672dc74df07dfe467891d6dfb00035
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.40.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.40.0.ebuild
deleted file mode 100644
index 334e74b90173..000000000000
--- a/kde-frameworks/kbookmarks/kbookmarks-5.40.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kconfigwidgets)
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.43.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.43.0.ebuild
index 763576f16e6e..a9abdf2d7f09 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.43.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index bc646e5ec173..2dcc12e6f867 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,3 +1,2 @@
-DIST kcmutils-5.40.0.tar.xz 235428 BLAKE2B b466237ffd804f77a00c2f25af2f901dbd01b783c19408a3d42ee3272c6548e3769d7f42647efb1957a20e6f2c50733bcb524c1575594393414eedc111aadbf4 SHA512 d59e225438d8c43d3c62ed15a3cb38fc08e05a2af4cdf6c1d0100347dd29a1e34906447eb96f9ef4c50bcb81c76e62d951df7d42e30a6214e9db5b3690880324
 DIST kcmutils-5.43.0.tar.xz 236960 BLAKE2B d72115eb335530d2b92b49316adefad9e8f66c2eb5e872c021462f7ee4785707e23c0f6c7ec46771135a55b0c6c4aad009189f13ae89c9b28f121bf05f0949aa SHA512 07c668fc50e2890809bac3287a37591abbfb26ff8f4fdb70ae4ebcd141cc54be78f7b3b86f20b68e582b16d6af85b507bae49fb4b7083f1ae61c340dae48115e
 DIST kcmutils-5.44.0.tar.xz 236920 BLAKE2B 83c250a49008ae84c35845a5dc13cfec55662ae1bd9490e72bf6e8d7ce52931e9fb346e06d279cf3e3b95013065a8bbfebbeff88c89b07315c72b4c85c2bc176 SHA512 251b939657766b31c8e61c1cb4a70d0f127eb7d9c4d8b1a0f3cc74cdc6da4e25c7f41587031606ec8608fc1780b20fc717b0a810b533af110f6f45ef99f5a189
diff --git a/kde-frameworks/kcmutils/kcmutils-5.40.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.40.0.ebuild
deleted file mode 100644
index 73855c838878..000000000000
--- a/kde-frameworks/kcmutils/kcmutils-5.40.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORK_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework to work with KDE System Settings modules"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcmutils/kcmutils-5.43.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.43.0.ebuild
index e6daae33a2d8..1f44ec43781e 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.43.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework to work with KDE System Settings modules"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 1adfedd29013..5ba0e536483a 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,3 +1,2 @@
-DIST kcodecs-5.40.0.tar.xz 218852 BLAKE2B 9fc8fd30ac8844e13fb89e8e4cac316b2e4467bbcf08996c95c23c6c5875193a1fc3b1398ed06fdc6058d0b018cc192e07d36a3f1d326b90bf336d11c5dade84 SHA512 575872407dcc0da771a7c43e9a751793bee8ac7b36bf262251c00ab7f8af1bcebba3010c3b0a62eddd678b0cea4c4bc58fbcbc7f9382264a06c6186004d96aa6
 DIST kcodecs-5.43.0.tar.xz 219764 BLAKE2B 4f6300ba9249055b611da8582ae25997a8329443c4e79a81e3a49e2481dbef87095f329e79d5c179361f3f495fc3b78834c2614fa0015f0856147e4867669fab SHA512 a6d81395a8b495fa2dded4d7a8331c8b987cf3e8d3b254cc9339863f0ff02c3b972b58f033075dfcc56d1fff21710b000f834de9bf9ce1d3ae1bab1a6bb90d64
 DIST kcodecs-5.44.0.tar.xz 219656 BLAKE2B a90c69e5ec69087ddd07ee611bcf7cd531f602e902453fd07aae07f366dc8cce7056a67067b824aa80053d92ad66858eb8d7723e54a9b0fce48d6af19c0e646f SHA512 601e0f11ecfde727c44fb10249f28da4440ac6910b4b27a8132455d6aa39343e7aff25b759c5a855171f04047ad915ce02dea1097e7998f33d343019593aefd0
diff --git a/kde-frameworks/kcodecs/kcodecs-5.40.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.40.0.ebuild
deleted file mode 100644
index ae681b361d09..000000000000
--- a/kde-frameworks/kcodecs/kcodecs-5.40.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for manipulating strings using various encodings"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-DEPEND="nls? ( $(add_qt_dep linguist-tools) )"
diff --git a/kde-frameworks/kcodecs/kcodecs-5.43.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.43.0.ebuild
index 007c0d0de0b7..e6408b0c1103 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.43.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for manipulating strings using various encodings"
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 DEPEND="nls? ( $(add_qt_dep linguist-tools) )"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 0b190100b734..8d298adc6092 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,3 +1,2 @@
-DIST kcompletion-5.40.0.tar.xz 118516 BLAKE2B e4cd2965f69d5d48b846af10cc6c3a1ba6041f5df5c6db4ea2885e14764f2b31811f3ca0b12e0c74253e9afd7942fd144ff6e6c2dd355e4fec07e73073ad6d60 SHA512 ffd59f3a9803856f43e2c9e7c125f789fe4ef5d261daf05e02c4f95df121b5854a1ac57d1249e734180ee205b49a742a717aee9572f5a69eb104a11aaa839b64
 DIST kcompletion-5.43.0.tar.xz 119212 BLAKE2B ddb17268ab9c19f7e72ac5d05c62f50cd770e9ee4536cb293af181d510856784098962e19395bbed376db062807f7d386c4dbb340ef6f485238b382e63ff0845 SHA512 a9ff9f512a46df6d70580150f702339b408390353b0c665eb60d28f34ec4484d558896d510f82300b8178a402f7b6c8e5d9f587a33c4bb242860855bfce8e158
 DIST kcompletion-5.44.0.tar.xz 119104 BLAKE2B baefba16256bad140980f38e974b57c01fcdb859a44f575f38f1ba6fe47ea9a52e72717b0a9d3ba00cd7ef55b9568494489e8b2343fc5d49b61399c4935240d0 SHA512 f72335fe665c0e8ec9b97c79a0191239d7a62bee6362d2289bb60741072125870fac631637dec216dcbb0f31973c162573d545cfae3e601a146018db0c6db2dc
diff --git a/kde-frameworks/kcompletion/kcompletion-5.40.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.40.0.ebuild
deleted file mode 100644
index f58563e1bb7c..000000000000
--- a/kde-frameworks/kcompletion/kcompletion-5.40.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kcompletion/kcompletion-5.43.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.43.0.ebuild
index 89c636704e5b..a2eb19569e49 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.43.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.43.0.ebuild
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 1c119798c1ad..08a171035b20 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,3 +1,2 @@
-DIST kconfig-5.40.0.tar.xz 234752 BLAKE2B e71f1e29d5edf5b5d0948814abd4735a1287cd5ddd164a563fecae18a976265c656a003f313bb9ed800e993eadbf343c94056cb3056f90538c65f3b9655665ef SHA512 c61f86144af8aba52341be2f2bd80dfa4a3a68fbf7daf65f49441c9ad00385080e161965bfbdd190e52cad023e8b7774bfb9e13546a9e909cc09de15c55fdfac
 DIST kconfig-5.43.0.tar.xz 235524 BLAKE2B 5dc70308e7d820233e13331a74bb2318bcb904dd882e3f5f499a10145869266bf4fbbd75a1fb6e9d170a96f8cf20ef0e0f7397956370f7e299b5998de405f7a9 SHA512 446d0b5b1aadc32a73e44cae77959d212a83cc036c288591c82b46734e616ce1124d3df09d4fa031f91c8bb08e452348588831435c44fe64247b341d62eb3279
 DIST kconfig-5.44.0.tar.xz 235604 BLAKE2B bbf5757241921ce183a1741da8084f23ba103715bb959cc8f582ca1e96a7eb8557c8a16379bf4e424b23f13513db0073ceeb3f0baaea5335972218da4b8ba5d3 SHA512 139e768bb0845fdfbe069786e3a669c4a8e22e15bcba01a7570c3c652dbd9827338be7f17e2633fb07526fb96da2f1a78f0fe84ace4b0bc45656cca8da748160
diff --git a/kde-frameworks/kconfig/kconfig-5.40.0.ebuild b/kde-frameworks/kconfig/kconfig-5.40.0.ebuild
deleted file mode 100644
index 40fa29393486..000000000000
--- a/kde-frameworks/kconfig/kconfig-5.40.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
-
-# bug 560086
-RESTRICT+=" test"
-
-DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfig/kconfig-5.43.0.ebuild b/kde-frameworks/kconfig/kconfig-5.43.0.ebuild
index 9701c9a50636..026517ddb6e5 100644
--- a/kde-frameworks/kconfig/kconfig-5.43.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for reading and writing configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 5b05591cade3..d96a7fe7edac 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,3 +1,2 @@
-DIST kconfigwidgets-5.40.0.tar.xz 375048 BLAKE2B 597608e9bde4d2552d1580b2fc9821846744af3cc3536c4f393daeb9707645e4ecc87db8950f80e6375887119d1e64c0de651b0901063161504f02016184acf5 SHA512 af8cb1aaddb69e21e6b0dcaff0caeb5f0e81d3b6db9b34216011f82872fe129cc5029b84fa90a54194d2c4270e35f868b24326e86a2a776e9e73b985fcdb09c3
 DIST kconfigwidgets-5.43.0.tar.xz 375456 BLAKE2B 2918c7cf1c74dde6bcf4189a30c945e28e958d95019dfcfa639fe85ded665d80395b60a12aefba63de2aac62f3ecb3edec8db8bb9c3d6641734b9300c23766b6 SHA512 57b5b8a76a7973bb04dec739b7ac3da0a8146623849fa8cbfee9eddc7224a5bf0ee933ee95787617217ecf38841355abef24c6d70da378b743401270ca25083d
 DIST kconfigwidgets-5.44.0.tar.xz 375004 BLAKE2B 64a1cb84ff0b79dd33c025dfd8117d0856622b2d26cb565dd059096ac02c8150196c892f5b3b59f42e767b61dd4716e78117002fda1afe44466c688f71642ec1 SHA512 f6b2badb6694349d860b5735bea9a5926f94c140b27d2f2d23573e104b0e2a213dc347f1e4d0fb4f3084b5892da5fecd13ec3bbca01894231a5a484ec3c41c73
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.40.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.40.0.ebuild
deleted file mode 100644
index 6494ce7da05e..000000000000
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.40.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing an assortment of configuration-related widgets"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+man"
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.43.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.43.0.ebuild
index 1c61d3a252eb..651438de3ff8 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.43.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing an assortment of configuration-related widgets"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+man"
 
 RDEPEND="
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index f2448d7aea2f..05ad2bb139c8 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,3 +1,2 @@
-DIST kcoreaddons-5.40.0.tar.xz 351348 BLAKE2B a999b49f5a184a4d1ed012fd7f21bae73c40614f9ea90d5fc19454b2134f2a79cbfe10c8e6d4a91f2951d055c150df3a8e1636c0de4d8329f41775684b9b1436 SHA512 e003cd743db0b7843f0cd293e73f1868123549d8872149e46d8d8a9733370642da0f0ec89c3794b1bf372d52e103612893875accfc954e28400088d4f3400572
 DIST kcoreaddons-5.43.0.tar.xz 355784 BLAKE2B dd76abee04ba0e3772b1e1c8b03192ad3ae2768e1ef54059cffdf0fbac5e1d75d31495951ebf37470823121b4dfef9dca19246c44ba31b2751589820361e1607 SHA512 895a6b3547f78f5222a16be71c8fe8865b922e2d9b2a8fedf322c7df607ccdb6b4fd3928470dc5cef385eaf13c37a5d1dcbd959afc326afb48b8636cb4a4b77b
 DIST kcoreaddons-5.44.0.tar.xz 351892 BLAKE2B 896ab12229cc3fc2a4c0c5a9bc2a7d3651ae5a152d0b1f74735db1d0377cca991e14a7ea86e44075cbd93870da181a899881625aad0de5ca1f378f72715674ff SHA512 8674a74c47dfbc8e85c1e487efd2fa8b2a5d23885d597d15b5d8b2b122596402afafb054e3be15a02cb06dda66efb2fc3259b235d3bf6546b78f388a0b9de525
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.40.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.40.0.ebuild
deleted file mode 100644
index 34941627eb9b..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.40.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="fam nls"
-
-RDEPEND="
-	$(add_qt_dep qtcore 'icu')
-	fam? ( virtual/fam )
-"
-DEPEND="${RDEPEND}
-	x11-misc/shared-mime-info
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-D_KDE4_DEFAULT_HOME_POSTFIX=4
-		$(cmake-utils_use_find_package fam FAM)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# bug: 619656
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.43.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.43.0.ebuild
index 4e70e58a430e..0d5479a4e6bc 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.43.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="fam nls"
 
 RDEPEND="
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 084a1c11be5d..9103515aa0ae 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,3 +1,2 @@
-DIST kcrash-5.40.0.tar.xz 21700 BLAKE2B 818e5f0fbf13a084cf42ef278775e04e8ed6b9d625f8dbd0e64dc18c4a9cf74c5d2bbe92731b18e4bcbdc5395877ada20783af9013396e06eba10979b791e815 SHA512 2440b64e5ec6dd38682a9d7fa92e112faa41c6190faae42cb291df4fe8c77ef4013d06a333a997fa25fe15ca2f8dc1bed36973f7ef44d7bc2b59c3bb9427403a
 DIST kcrash-5.43.0.tar.xz 21772 BLAKE2B 48b61db7208be9a00c5159f66b3558d186e79840e28b2f0e167c27f1d30643a6500f50363db1b063786322d59eaeb40cb3dba72ee7160ec28e7769c7a64a3ac2 SHA512 1733807f55d5914b67d7b009ef8b34d0c54e3e1fb40a373df7651d65dc3180033ec8872c105d243134e7e38ea6fa9992f2d4803d9b2915721a3c0d8c43c7464c
 DIST kcrash-5.44.0.tar.xz 21772 BLAKE2B 91e78e0fcc9011f7ab3dcf4b87529affcc5f3d3596492001fbe2b12526061cad45f65272e05c167afad3435a036c89a5a3291cb48d1d8bddb69078522a5d3874 SHA512 a7ba76bc2eea699b6c214b3e574c5e5a8fb148644218c0d5f1f796f594f94c28ab78379568b47d75e0584b6e522522460d124f9548abd7964c4eb656f190a6d4
diff --git a/kde-frameworks/kcrash/kcrash-5.40.0.ebuild b/kde-frameworks/kcrash/kcrash-5.40.0.ebuild
deleted file mode 100644
index 884fa5a43319..000000000000
--- a/kde-frameworks/kcrash/kcrash-5.40.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for intercepting and handling application crashes"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtwidgets) )
-"
diff --git a/kde-frameworks/kcrash/kcrash-5.43.0.ebuild b/kde-frameworks/kcrash/kcrash-5.43.0.ebuild
index 48dfa9269f8b..b5cd90f64080 100644
--- a/kde-frameworks/kcrash/kcrash-5.43.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for intercepting and handling application crashes"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 # requires running kde environment
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 6a9fe1a4656f..a2ea00b8e853 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,3 +1,2 @@
-DIST kdbusaddons-5.40.0.tar.xz 36160 BLAKE2B 6814bbc026e3abc06fbf70e5f71529231b373c5fefcb15eca9c61fe7000662daa6756201d8620ddba6fd4df38e46f6b2335161ae075f1c2444304240cf9c2a87 SHA512 439c0baa9531ae93606e24dcdbc1fbda4a04032ccdcb2c218c0e12f97c34a0b9522bde377f0763d800f8b17ca41b6893f3854d7e8c494ad2809f493023368a7a
 DIST kdbusaddons-5.43.0.tar.xz 36960 BLAKE2B 3ed05ef60534fd7d658116daf2faa76950cb2edc3a943a7917e4ec6c4fb53e283603713f251348473cab02e2bcf857459742067661d6c53262228d4457ca4009 SHA512 395fdb0e2387c6eb2dfafc1f84eb86e24d4bc79dc4f3b914fe956f0614ffb40d2cbd66a550b88e8fc19d676de20fccd786737f03291c11624bdb5704da7a8e1b
 DIST kdbusaddons-5.44.0.tar.xz 36964 BLAKE2B 4ffd873c55fb57337447cecd981a830f5746e21e7aad7efaca894a18246d973efb546213ec5faab786f88385ec367210e9a0a89bc44b3cc9c36c44eec2aec613 SHA512 1bc040c10bcfe9b2fc38227747a734141d944f4ff93f48e485eae7448aba4fdd094103bd554ad461e7b1b8a180c5be0c575a69c0bc3e6f8988eb4ed0979b5fc6
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.40.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.40.0.ebuild
deleted file mode 100644
index 83a54db4fae1..000000000000
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.40.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALDBUS_TEST="true"
-inherit kde5
-
-DESCRIPTION="Framework for registering services and applications per freedesktop standards"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls X"
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.43.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.43.0.ebuild
index 0bc5ed5c0fef..6f9e60af249e 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.43.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for registering services and applications per freedesktop standards"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls X"
 
 RDEPEND="
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 5b078efceb6e..36176e517d38 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,3 +1,2 @@
-DIST kdeclarative-5.40.0.tar.xz 167988 BLAKE2B 1d5582c1df506401ba09c60f3e41b2628e09c028dfea7b967cf021cb6a4926766332ec78f59edb703b5d77e9827c69f97b49c7f5e2cf19248aace8df4e3433ab SHA512 b934a4404717d2c47a28282937ef04e724e0b492e6838974765ccb3cd1ba62ac2d598c5e55e4e6cdd7831f521ae95c67dfeaab04353b89fb46393d9610d65e66
 DIST kdeclarative-5.43.0.tar.xz 171136 BLAKE2B 8739a7a64b743b8232885d446a1692e774d13d35a2df031cdf44b3f8582875eff279c2c6d35e495ac661a1aea9fbc0b851108f6d9edce942a6a658f03be6e5c1 SHA512 5e9494adee19b40ffefbf006e318ba34302e073e9a22a94db255ebba2cec2e066df380063c7c617af81d0fc3f719753e2c050e6daf792f2f3a9d6c08163b616d
 DIST kdeclarative-5.44.0.tar.xz 170956 BLAKE2B a3ec9b65a9eae771a5929e40746ae58eba109ed742d1bc77910d1ca09cec20f20dd5932c14623e805e211ef275469e2f60789554eb48251d3532c9058d2dbec0 SHA512 ddad824dbce395a64bc6bf2362b4079a758a6b67e09edbd390c2b07c9631fee88a14aa24ee27844441d9580f4dfa6180b3c19f8a0eb4762fd33935b31a237a52
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.40.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.40.0.ebuild
deleted file mode 100644
index ead4cb68e534..000000000000
--- a/kde-frameworks/kdeclarative/kdeclarative-5.40.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing integration of QML and KDE work spaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.8.0
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdeclarative '' '' '5=')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.43.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.43.0.ebuild
index 4076d6e93916..9e9e6cf7fc3d 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.43.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing integration of QML and KDE work spaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 # drop qtdeclarative subslot operator when QT_MINIMAL >= 5.8.0
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index ca2ad11d2055..b7d7008c4c55 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,3 +1,2 @@
-DIST kded-5.40.0.tar.xz 38152 BLAKE2B 12e23dcf366fac8714abbfdfe19cac818f5b127b4d44e142363c6cd005924b14237420352314bb0e6f95b9d990b4844ae0ead4a511df46f5316483892a94ae73 SHA512 559cc4bff3d18104326fdcdb35eca16e36b06c6a8547e77ac78833931f32f22c8497e4db08434bf889a7cdfaf72affaff342487e2387748705b49b6feb9e30a8
 DIST kded-5.43.0.tar.xz 37736 BLAKE2B 9990d2eef361232971bd82fdb3956538d5eb4fd47df9d5863f64443fd90bc87eddab142f37ec64ee98303c033b8f060061600ce7c45c0279dc0e20956228babc SHA512 cb62ad4b0be13b103810a0396614da3a6137076041102a6aca5b30c477b5bab472298bdedd869e3476725dd21368075273193afd7027b9dcf1ad84594f6bbb32
 DIST kded-5.44.0.tar.xz 37744 BLAKE2B 9e81c40a589c591c808f9a81ad43f2c2e9c641b22a07aacfc83f349b086fb0372c385b934d362df74c65ef2d7d75e3d88a5315db4ff8fdfa15d9847d3415f3b0 SHA512 571dc3e54e5d17dd46b99080c15314d711da93d26fd2e4cc39f6acd14f34ec775ec504275459b40d81613421d19411c5480f23ddcd783027e0f621ac2160a1b7
diff --git a/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch b/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch
deleted file mode 100644
index 96fa447c9bc2..000000000000
--- a/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 185afa8a3af8002172d8f5d6aa08c57244422a12 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Thu, 2 Nov 2017 22:27:29 +0100
-Subject: kded: remove dbus calls to ksplash.
-
-Summary:
-Not needed anymore since June 2016 (b6058a0 in plasma-workspace, i.e. Plasma
-5.7).
-
-Originally at https://git.reviewboard.kde.org/r/129010/
-
-Test Plan: none, this is dead code
-
-Reviewers: davidedmundson
-
-Reviewed By: davidedmundson
-
-Subscribers: #plasma, #frameworks
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D8632
----
- src/kded.cpp | 21 ---------------------
- 1 file changed, 21 deletions(-)
-
-diff --git a/src/kded.cpp b/src/kded.cpp
-index 526bd4e..11ddd4f 100644
---- a/src/kded.cpp
-+++ b/src/kded.cpp
-@@ -37,7 +37,6 @@
- #include <QDBusConnectionInterface>
- #include <QDBusInterface>
- #include <QDBusServiceWatcher>
--#include <QDBusPendingCall>
- 
- #include <KDBusService>
- #include <kconfiggroup.h>
-@@ -777,28 +776,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[])
-         (void) new KUpdateD;    // Watch for updates
-     }
- 
--//NOTE: We are going to change how KDE starts and this certanly doesn't fit on the new design.
--#ifdef Q_OS_LINUX
--    // Tell KSplash that KDED has started
--    QDBusMessage ksplashProgressMessage = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KSplash"),
--                                          QStringLiteral("/KSplash"),
--                                          QStringLiteral("org.kde.KSplash"),
--                                          QStringLiteral("setStage"));
--    ksplashProgressMessage.setArguments(QList<QVariant>() << QStringLiteral("kded"));
--    QDBusConnection::sessionBus().asyncCall(ksplashProgressMessage);
--#endif
--
-     runKonfUpdate(); // Run it once.
- 
--#ifdef Q_OS_LINUX
--    ksplashProgressMessage = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KSplash"),
--                             QStringLiteral("/KSplash"),
--                             QStringLiteral("org.kde.KSplash"),
--                             QStringLiteral("setStage"));
--    ksplashProgressMessage.setArguments(QList<QVariant>() << QStringLiteral("confupdate"));
--    QDBusConnection::sessionBus().asyncCall(ksplashProgressMessage);
--#endif
--
-     int result = app.exec(); // keep running
- 
-     delete kded;
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/kded/kded-5.40.0-r1.ebuild b/kde-frameworks/kded/kded-5.40.0-r1.ebuild
deleted file mode 100644
index 4dc2644a299d..000000000000
--- a/kde-frameworks/kded/kded-5.40.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Central daemon of KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+man"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-
-PATCHES=( "${FILESDIR}/${P}-obsolete-dbus-calls.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kded/kded-5.43.0.ebuild b/kde-frameworks/kded/kded-5.43.0.ebuild
index 56820aeda550..e848eb53a358 100644
--- a/kde-frameworks/kded/kded-5.43.0.ebuild
+++ b/kde-frameworks/kded/kded-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Central daemon of KDE workspaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+man"
 
 RDEPEND="
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 408f4493a632..972e72d5594d 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,3 +1,2 @@
-DIST kdelibs4support-5.40.0.tar.xz 3341884 BLAKE2B 693816728db15b9e8d28fa2c01634083d11d4b3da942fd06606eaf7715e75ac14978bb9020df37ae154e4dddf740e0672fc90f561f2d467307a24f0362bb282a SHA512 ea6758a42d993af312f0231c75b77f00c0a4938dfd8efa82d443d60e553865ed59621413a651aef1443ec1d07bcc273532b11f1699382b66c0ea91e2bfdf94d1
 DIST kdelibs4support-5.43.0.tar.xz 3343312 BLAKE2B 96a73c18df4110c4a51d78114ef8e10311429c280582bdd9e95a73c4c809157706e565ea33e14cb8f3ce595b1d13d7c8348e3212e1293896ae556bf829f2a641 SHA512 bd73459e5334a1158f68d2af2032fa9236bae303c2c45ac9c3b46ffcf46654f9175fae68222a7cfb3398642634aa21fd023f19f0318af633574f448bfab8e467
 DIST kdelibs4support-5.44.0.tar.xz 3345800 BLAKE2B 29b90436748cfa290b9a341412f53f1b7c8d3f036c55e2f207f9f8a92e7f65d62e854ea136236b153ba04ff06e1c17c4971a0361ab9ff971d4b64331836d57b6 SHA512 57f48f9221f3cef5b6346a223086ce528117f00bd042c3c207c4bea8f5ce7ebf10ea6f11da88bab25539e84b778a37c35d053a867b8f973e68adbe951bb73337
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch
deleted file mode 100644
index ad7cd7999672..000000000000
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 00cae452ac619810f311cf63d4dfd268887d30e5 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Sun, 5 Nov 2017 22:52:54 +0100
-Subject: Fix build with LibreSSL
-
-Summary:
-Unfortunately LibreSSL sets OPENSSL_VERSION_NUMBER to
-0x20000000L and doesn't support the OpenSSL 1.1 API.
-
-Test Plan: Builds with LibreSSL
-
-Reviewers: #frameworks
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D8672
----
- src/kssl/kopenssl.cpp        | 34 +++++++++++++++++-----------------
- src/kssl/kopenssl.h          |  2 +-
- src/kssl/ksslcertificate.cpp |  2 +-
- 3 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/src/kssl/kopenssl.cpp b/src/kssl/kopenssl.cpp
-index c68a134..ce5f137 100644
---- a/src/kssl/kopenssl.cpp
-+++ b/src/kssl/kopenssl.cpp
-@@ -81,7 +81,7 @@ extern "C" {
-     static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = nullptr;
-     static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = nullptr;
-     static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = nullptr;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     static void (*K_CRYPTO_free)(void *) = nullptr;
- #else
-     static void (*K_CRYPTO_free)(void *, const char *, int) = nullptr;
-@@ -430,7 +430,7 @@ KOpenSSLProxy::KOpenSSLProxy()
-         K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolve("RAND_load_file");
-         K_RAND_file_name = (const char *(*)(char *, size_t)) d->cryptoLib->resolve("RAND_file_name");
-         K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolve("RAND_write_file");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         K_CRYPTO_free = (void (*)(void *)) d->cryptoLib->resolve("CRYPTO_free");
- #else
-         K_CRYPTO_free = (void (*)(void *, const char *, int)) d->cryptoLib->resolve("CRYPTO_free");
-@@ -485,7 +485,7 @@ KOpenSSLProxy::KOpenSSLProxy()
-         K_X509_STORE_CTX_get_current_cert = (X509 * (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_current_cert");
-         K_X509_STORE_CTX_set_error = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_error");
-         K_X509_STORE_CTX_get_error = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_error");
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_free");
-         K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_num");
-         K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_pop");
-@@ -979,7 +979,7 @@ void KOpenSSLProxy::X509_STORE_free(X509_STORE *v)
- 
- void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *))
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     X509_STORE_set_verify_cb_func(store, verify_cb);
- #else
-     if (K_X509_STORE_set_verify_cb) {
-@@ -1044,7 +1044,7 @@ X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a)
- 
- void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     if (psig) {
-         *psig = x->signature;
-     }
-@@ -1096,7 +1096,7 @@ void KOpenSSLProxy::X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,
-     }
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- void KOpenSSLProxy::CRYPTO_free(void *x)
- {
-     if (K_CRYPTO_free) {
-@@ -1122,7 +1122,7 @@ X509 *KOpenSSLProxy::X509_dup(X509 *x509)
- 
- ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return X509_get_notBefore(x);
- #else
-     if (K_X509_getm_notBefore) {
-@@ -1135,7 +1135,7 @@ ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x)
- 
- ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return X509_get_notAfter(x);
- #else
-     if (K_X509_getm_notAfter) {
-@@ -1413,7 +1413,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose)
- 
- X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return v->current_cert;
- #else
-     if (K_X509_STORE_CTX_get_current_cert) {
-@@ -1426,7 +1426,7 @@ X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v)
- 
- void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     v->error = error;
- #else
-     if (K_X509_STORE_CTX_set_error) {
-@@ -1437,7 +1437,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error)
- 
- int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return v->error;
- #else
-     if (K_X509_STORE_CTX_get_error) {
-@@ -1894,7 +1894,7 @@ int KOpenSSLProxy::EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
- 
- int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return pkey->type;
- #else
-     if (K_EVP_PKEY_base_id) {
-@@ -1907,7 +1907,7 @@ int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey)
- 
- RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return pkey->pkey.rsa;
- #else
-     if (K_EVP_PKEY_get0_RSA) {
-@@ -1920,7 +1920,7 @@ RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
- 
- void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     if (n) {
-         *n = rsa->n;
-     }
-@@ -1939,7 +1939,7 @@ void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, c
- 
- DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     return pkey->pkey.dsa;
- #else
-     if (K_EVP_PKEY_get0_DSA) {
-@@ -1952,7 +1952,7 @@ DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
- 
- void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     if (p) {
-         *p = dsa->p;
-     }
-@@ -1971,7 +1971,7 @@ void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, c
- 
- void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     if (pub_key) {
-         *pub_key = dsa->pub_key;
-     }
-diff --git a/src/kssl/kopenssl.h b/src/kssl/kopenssl.h
-index 518cd5b..fa23efe 100644
---- a/src/kssl/kopenssl.h
-+++ b/src/kssl/kopenssl.h
-@@ -395,7 +395,7 @@ public:
-     /*
-      *   CRYPTO_free - free up an internally allocated object
-      */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     void CRYPTO_free(void *x);
- #else
-     void CRYPTO_free(void *x, const char *file, int line);
-diff --git a/src/kssl/ksslcertificate.cpp b/src/kssl/ksslcertificate.cpp
-index 4c96e4b..e9631fb 100644
---- a/src/kssl/ksslcertificate.cpp
-+++ b/src/kssl/ksslcertificate.cpp
-@@ -1222,7 +1222,7 @@ QByteArray KSSLCertificate::toNetscape()
- {
-     QByteArray qba;
-      // no equivalent in OpenSSL 1.1.0 (?), so behave as if we had no OpenSSL at all
--#if KSSL_HAVE_SSL && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if KSSL_HAVE_SSL && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-     NETSCAPE_X509 nx;
-     ASN1_OCTET_STRING hdr;
-     QTemporaryFile ktf;
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild
deleted file mode 100644
index 1c7a2e9cbce4..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="libressl X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(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 kdbusaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesignerplugin)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	app-text/docbook-xml-dtd:4.2
-	virtual/libintl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_qt_dep designer)
-	dev-lang/perl
-	dev-perl/URI
-	test? ( $(add_qt_dep qtconcurrent) )
-	X? ( x11-proto/xproto )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kitemmodels)
-	$(add_qt_dep qtxml)
-	!<kde-apps/kde4-l10n-16.04.3
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-libressl.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.43.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.43.0.ebuild
index 111c1d3718c3..00c1376f5092 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.43.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="libressl X"
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index 8170af82b315..50462c4205de 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,3 +1,2 @@
-DIST kdesignerplugin-5.40.0.tar.xz 90812 BLAKE2B 2b1a0cf79ab47f228aa3234f11e613e91e1b3543bce471cc61f06193cbb4d41b817fae78fa4f01625d87a5eefdf13edcd170a216e3c90954fb0c39a1111bf3d7 SHA512 e9874339ac1d694f249a20fe86504b776959b4e225b5377ba27df8cea14ffd35a42516308cb2daef0a9595c0f57ecb1328c35778d00fa05add19f7e5cce4dd99
 DIST kdesignerplugin-5.43.0.tar.xz 90752 BLAKE2B 411abd7413ee1217196a48d9cb757a1bc9cc260c6e3cad94bcdfea37d5c8d8a7013c61063331dbd1181ef2b172b00c4d73b71fcd495410b999c7d4f6803c458b SHA512 38422393c7a061fada3054fd511bafa3c2d529fe819c86854cbf48db1ea92ec2496fa3df947a985f029d5d3110fae33c89d60b853d59a601f6f172f5b15c0684
 DIST kdesignerplugin-5.44.0.tar.xz 90732 BLAKE2B 4acc16cc82bee5132315f92e1cb4afa42f1f4eebd7cc17894fec793419f6893b563948cdeccc988b133cb85ec29e390ad52b7776dd13f65a7856def4a6c6c20f SHA512 1283f34fa6bd1687aa55dbd9632a9aa8220b106b062fa399a16040f86cc5dc36b1aa81f2d69302a20376439020b9bdf873ee67afaae230da61bff2081e559ee9
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.40.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.40.0.ebuild
deleted file mode 100644
index 0c3797af44c8..000000000000
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.40.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="designer nls webkit"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	designer? (
-		$(add_qt_dep designer)
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kiconthemes)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep kplotting)
-		$(add_frameworks_dep ktextwidgets)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-		$(add_frameworks_dep sonnet)
-	)
-	webkit? (
-		$(add_qt_dep designer)
-		$(add_qt_dep qtgui)
-		$(add_frameworks_dep kdewebkit)
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer KF5IconThemes)
-		$(cmake-utils_use_find_package designer KF5ItemViews)
-		$(cmake-utils_use_find_package designer KF5KIO)
-		$(cmake-utils_use_find_package designer KF5Plotting)
-		$(cmake-utils_use_find_package designer KF5TextWidgets)
-		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
-		$(cmake-utils_use_find_package webkit KF5WebKit)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.43.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.43.0.ebuild
index 6690b0297aba..fdf2d213f9c1 100644
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.43.0.ebuild
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.43.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="designer nls webkit"
 
 RDEPEND="
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index f6123bcc08d4..4f6c3ff52ede 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,3 +1,2 @@
-DIST kdesu-5.40.0.tar.xz 45172 BLAKE2B ad77dda07ce78fa1042835f43846e992bfc3291570ddc91cd05331fd167b4be2f62515d7e65b498a62e57759761bb8be0ab98440cb63199954d4ec2f6a571034 SHA512 53ecfc0388a8246ec6b29de63ddb580071eaca33f7b1806e77b1200d79bbccb2bef38e4b482f0dd53e4767c873dc64d8cceb03d9ae75be41e8fe5a56ec90ebf1
 DIST kdesu-5.43.0.tar.xz 45016 BLAKE2B e17add21fe42bfc60d5f6407033225bec901be8a3a4b7ae5c5f05012146f4cfd791770e8a829776636d7c4dfd8fbb3d963fdf56d6f00134d95f6de1fd7e600ab SHA512 efed4e7583b2f862115a5a016c647bbe0a6043027a0466d4237f7c3e0c0b2afc8995ea75ae371e0c73a7d550628d3713adf430173ba411d958d807fed35cbd38
 DIST kdesu-5.44.0.tar.xz 45008 BLAKE2B 595855f727bdde31762d87c90996549e8e19b6bd59298d577f6093df353375112c2321c48dd390c69fcb03e08b65b04f72ed5c235ef4c56a3e4f22b98040b4c1 SHA512 3917c60c5535822a23daa12856b8c39b1ed312696a3104ee223532fda542c5898947dc1e1374d035b6f47852a1d87adb8021ab5e948be235f452a9ad0dd68e28
diff --git a/kde-frameworks/kdesu/kdesu-5.40.0.ebuild b/kde-frameworks/kdesu/kdesu-5.40.0.ebuild
deleted file mode 100644
index 84a389c030dc..000000000000
--- a/kde-frameworks/kdesu/kdesu-5.40.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework to handle super user actions"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="X"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesu/kdesu-5.43.0.ebuild b/kde-frameworks/kdesu/kdesu-5.43.0.ebuild
index 77596093feb2..15d2104b99ca 100644
--- a/kde-frameworks/kdesu/kdesu-5.43.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework to handle super user actions"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index 75bf859ebd8a..136312f43912 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,3 +1,2 @@
-DIST kdewebkit-5.40.0.tar.xz 29392 BLAKE2B cc67ebaa82c35c673d0f502c3b1267b52ced914bf6b7ab1d676fffaf34cfa41255333b81f55443474f9db77c5a477e4429c8d3790f5f2ab8f5479f1b50d0b262 SHA512 4074dbfab85ca4421b447eb1ad5f262bb54d79d98c934ad57a9cb35f7c624e93af8ad22ee4979404c6d743750b8fca85f4c7533f4cb577356e0d011ff75c06a1
 DIST kdewebkit-5.43.0.tar.xz 29296 BLAKE2B 06d36541bf444055b773fe9ff022416204aa1518c4336a6334d8f6b9a61b14391b23b26870d145c135573338e759142e4ae97051502bc522124b2193d22ae5cb SHA512 eda64ac826d2c4abd3b4d5ba9d73064d7c0ec38b91f1ccb68e69d14066f453b2ef43e68e89dfd4f694efe66fccb94a4589891af6a521b93657c98db6ae94de9f
 DIST kdewebkit-5.44.0.tar.xz 29280 BLAKE2B 3ff588609e75aa6301009dca5db9f2991dec602843d4fca95d57690a1b86ec75a93f3a9008a43905ed4035bb28c54f3bcc4849347257284eb7bb19c79a6b306a SHA512 a78afafea87fb0214218bc7503c820ccbb7beb035c8323a0c7da9151c0b449ceff9191be9de1a78b658667bd7533c59a07b3281eb0abf6c61487ce006f8c4dfb
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.40.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.40.0.ebuild
deleted file mode 100644
index e13e349d1f4b..000000000000
--- a/kde-frameworks/kdewebkit/kdewebkit-5.40.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing KDE integration of QtWebKit"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtnetwork)
-"
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.43.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.43.0.ebuild
index 1fb4c4ccfb80..abf50a0ae0ce 100644
--- a/kde-frameworks/kdewebkit/kdewebkit-5.43.0.ebuild
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing KDE integration of QtWebKit"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index a43639f9787f..441b29e7855e 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,3 +1,2 @@
-DIST kdnssd-5.40.0.tar.xz 56676 BLAKE2B db806d3a416eccd33cec8282c08a2443dec1f5e10e392e244c407597cfdc2ffb1ea52633b1414f71d9e80c285ea88f19363b56768e5550f8c406682f17646e75 SHA512 409860a7ffc753780c26d62c89dcade8674393edfcbf817403386f437f23e9495455e6c29c179901820bd9eec5fe3d7622d12fa2d0b06f79ce8f0a4664a36726
 DIST kdnssd-5.43.0.tar.xz 56648 BLAKE2B 941821bd824934a3ae573e32b67d2cf081538e1cf071aee486ac6daf74d947535d4dd70876d64458b533b03d021e7ede49c0f502e95737900d579d97513b9ad3 SHA512 d84714e0d9b247f719b4c8d82c8927a132c98d8261d858fc6cbc2d1be619daa4d64f513d0c71d626e63ed887639689436cc593c8024b07d583103cb2537402b3
 DIST kdnssd-5.44.0.tar.xz 56644 BLAKE2B 6202c34684b6914e5b3fb160acbc14e8d87abb3171af8624440b400eb6271fcdcb88104bb0771020708991f6a75be2d61d505331d56fd7db87c89f9bad4bf5a4 SHA512 178165a3a3a1a1dffad39cae4466144bd90ba6aa79bf96305c35a3eb2566b14aa231a1a325fd316c0af9230047e6c3165b717aa8ef689371ad8752261c850cb7
diff --git a/kde-frameworks/kdnssd/kdnssd-5.40.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.40.0.ebuild
deleted file mode 100644
index 566bd63695e9..000000000000
--- a/kde-frameworks/kdnssd/kdnssd-5.40.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for network service discovery using Zeroconf"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls zeroconf"
-
-RDEPEND="
-	$(add_qt_dep qtnetwork)
-	zeroconf? (
-		$(add_qt_dep qtdbus)
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
-		$(cmake-utils_use_find_package zeroconf Avahi)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdnssd/kdnssd-5.43.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.43.0.ebuild
index 4abdda53e524..f89854f48951 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.43.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for network service discovery using Zeroconf"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls zeroconf"
 
 RDEPEND="
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 3848fa07c1ff..388dac8b4cbb 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,3 +1,2 @@
-DIST kdoctools-5.40.0.tar.xz 421668 BLAKE2B d3dc3dd85b8883042064ca68f9de9d575210adc0055113bb9cd71a5086edb732897039b29ef47df0861b9bb73ed5493e2ee146420e53db9237ae7f6592e40f9e SHA512 7279a2bbb01c9b6e31e4c7c1b9b5b1a14d9ba8ec78e63d4bf635838fbf01bc90e88ea9eb0788886548cd6c031b6c7d270c667c13f2c14d4fda6a786bc94d641b
 DIST kdoctools-5.43.0.tar.xz 422032 BLAKE2B 6eb0261193b0ce3c8cc0835ae15d0d16d4009f98b1ba02e562b43f9147abe33695d63d37a772bab9558ad6c8cc63efb7bf35b263399e54b771c64ecb22112b36 SHA512 af93b4ab7966246b38933eccd02ce2dd02c288e3f582c9b3e14e05aa03293c32ae78c0b3cda6710012faf368de4efab5d06ad3df8e279d1dda967d2860d5e62c
 DIST kdoctools-5.44.0.tar.xz 422064 BLAKE2B 5a5ac41f5a5975eeec019b1cb0bdaa7e225baad7b4dcbf082693c1b55a5caced5811e89be140a3a97f8448d2a0bde545fab3aa46dfdbbbc6b3fd2235881809c5 SHA512 512f381fc8bc3b6785162396eb8887947c88c1ea8d51cf74581022fe5c777bdc1b26340c7546c7b9507ebf8410d371a5516b6628aba8a6db8fc4beb405afd105
diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.40.0-pt_BR-fix.patch b/kde-frameworks/kdoctools/files/kdoctools-5.40.0-pt_BR-fix.patch
deleted file mode 100644
index 529f5294009a..000000000000
--- a/kde-frameworks/kdoctools/files/kdoctools-5.40.0-pt_BR-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 850029f5c664b8a496fead6fe5489c2b4aebae7a Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-Date: Wed, 29 Nov 2017 22:28:53 -0200
-Subject: Update Brasilian Portuguese translation
-
----
- src/customization/pt-BR/user.entities | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/customization/pt-BR/user.entities b/src/customization/pt-BR/user.entities
-index 11abcd5..c63a743 100644
---- a/src/customization/pt-BR/user.entities
-+++ b/src/customization/pt-BR/user.entities
-@@ -33,6 +33,11 @@
- <!ENTITY plasma-desktop	"<productname>&kde; Plasma Desktop</productname>">
- <!ENTITY plasma-workspaces	"<productname>&kde; Plasma Workspaces</productname>">
- <!ENTITY plasmapa	"<productname>&kde; Plasma Pulseaudio</productname>">
-+<!ENTITY PgUp   "<keysym>PgUp</keysym>">
-+<!ENTITY PgDn   "<keysym>PgDn</keysym>">
-+<!ENTITY Left   "<keysym>←</keysym>"> <!-- Cursor key-->
-+<!ENTITY Right  "<keysym>→</keysym>"> <!-- Cursor key-->
-+<!ENTITY Space  "<keysym>Espaço</keysym>">
- <!ENTITY BDM 	"botão <mousebutton>direito</mousebutton> do mouse">   <!-- English: &RMB; -->
- <!ENTITY RMB 	"botão <mousebutton>direito</mousebutton> do mouse">
- <!ENTITY Shift	"<keycap>Shift</keycap>">
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/kdoctools/kdoctools-5.40.0-r1.ebuild b/kde-frameworks/kdoctools/kdoctools-5.40.0-r1.ebuild
deleted file mode 100644
index 9f5b3424edcc..000000000000
--- a/kde-frameworks/kdoctools/kdoctools-5.40.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	app-text/sgml-common
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/URI
-"
-
-# already required by media-video/kaffeine-2.0.14
-PATCHES=( "${FILESDIR}/${P}-pt_BR-fix.patch" )
diff --git a/kde-frameworks/kdoctools/kdoctools-5.43.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.43.0.ebuild
index 02032df43e84..8ade10897ebb 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.43.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index ad5d6e35c99c..7d4e3f32aed0 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,3 +1,2 @@
-DIST kemoticons-5.40.0.tar.xz 1695752 BLAKE2B 18622f98044f1930822ed5d40fb0331b8ea15ad5bbf68b0d42c98e8f6ede97348de22d4e6f9cadd2c14ec06c2b82b20ef975bc6191a484f999b10ce5b99df817 SHA512 47dc8f65f29d297a3229fba0a63d5f0eb959fe072e44dfc831f33b4a778cfae1f267abe6cbf264a69d3ea677a8cd2d94898ba9f7e0852bfcb7573b368cb1c289
 DIST kemoticons-5.43.0.tar.xz 1696184 BLAKE2B ef8322ffd50430630d46790f9dc2130b8081b822d5aa79225ea2790ad3ee4bcb916d124ba9d283d0dc5df7003dd6b6b3131be56f3654c71826b0dee8f88642b8 SHA512 130011a2158f5d84ba664354900e23eaf8867623eeab0fe018c6b8c60b3fd413d3f5e1ad43a3fe51dbc0153bec3e8c14d88b7f06f82d873c2d7f2237441eb8d8
 DIST kemoticons-5.44.0.tar.xz 1696104 BLAKE2B 56cbe7235772752be669a5215e42a06e5a22b57fb03604837af439c7722804fef2633ef010a023a0bcbea23b31cce0583edd4dda616a4ce9b51704e13f45c74f SHA512 14fd607e51cbd53f7a161ee56bf986d54708763b5a771c37e04693adb22a278169451d3317b17d71a0c8e14f118754b415e99fc27f30ab5c8e0ab670f106a28a
diff --git a/kde-frameworks/kemoticons/kemoticons-5.40.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.40.0.ebuild
deleted file mode 100644
index 58fc7d47cd03..000000000000
--- a/kde-frameworks/kemoticons/kemoticons-5.40.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for converting text emoticons to graphical representations"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-frameworks/kemoticons/kemoticons-5.43.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.43.0.ebuild
index a3ab980b96f9..0632578d588f 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.43.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for converting text emoticons to graphical representations"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index d421f51f6153..9feb939e7ead 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,3 +1,2 @@
-DIST kfilemetadata-5.40.0.tar.xz 219196 BLAKE2B abeda591043350e1b11de352f897f76110b1ea472ccfc210739c68d50715fb8687fae4d9c6281c48592f563a82ad8f454660349dee020a80bab2b967e598367f SHA512 b3f632af0847dd3bed8bf0214e3786fe72ffbdc90454d7a2117e8b30023c43b594a27c5811a6e77d1e46a68261e950a5dc016b9ae6f80f3db539c29eaa53297d
 DIST kfilemetadata-5.43.0.tar.xz 219608 BLAKE2B 5b344ac9990e399cf3b4c8b28b6667e902691541672e811295a7e3ba16f652b4e8dc10728040d2ac60dbc7778e5bd27e64b38ed8f2116589a9899b9b5b86f5ff SHA512 0e669ae832aeef2a54e6a26df5541d607301e13798082e716f6caf682d4e28d87d7eb0a4487c7f2c8bfee0311a5a3342238dfa806413fccb20d3cfbf6b8733be
 DIST kfilemetadata-5.44.0.tar.xz 219528 BLAKE2B 482948d67916e759a73b30bc5e359a8ff464707246fc214728886a88d41d00045163cfbe7ad5567653eabd71ca9eee60090b61d7b249b533d847b926aaa2282f SHA512 9c3c9edc107743e357a6db3f9cad9732602a4286968d10c380e70e4434be8ee16b5aadf9d0a452b78e6262cfc9d765a2d6a1470d664e4c41d33cb9aa4e12484f
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.40.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.40.0.ebuild
deleted file mode 100644
index 46033d81c474..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.40.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit eutils kde5 python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="epub exif ffmpeg libav office pdf taglib"
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtxml)
-	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2:= )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	office? ( $(add_frameworks_dep karchive) )
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-	!taglib? ( $(add_qt_dep qtmultimedia) )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-apps/attr )
-	test? ( ${PYTHON_DEPS} )
-"
-
-REQUIRED_USE="test? ( taglib )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package exif Exiv2)
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_find_package office KF5Archive)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package taglib Taglib)
-		$(cmake-utils_use_find_package !taglib Qt5Multimedia)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
-		elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "indexing of Microsoft Word or Powerpoint files" app-text/catdoc
-		optfeature "indexing of Microsoft Excel files" dev-libs/libxls
-	fi
-}
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.43.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.43.0.ebuild
index eed8f6443f9c..a9c7e1e6bd84 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.43.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.43.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit eutils kde5 python-any-r1
 
 DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="epub exif ffmpeg libav office pdf taglib"
 
 RDEPEND="
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index c0235f1758f2..8bfe79327192 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,3 +1,2 @@
-DIST kglobalaccel-5.40.0.tar.xz 83628 BLAKE2B 774596c4b6c29cc208053b54227093120e1cc7efbb794f29d260626cc5337587f62537ffd3ec9269338fdeb417af0f538ad845888cd8345b08410ac5b181c2fb SHA512 5b4a5d557338eb149257448cbabd7df9d7969ce2d977e13a4d104fe4c21d262b952f820614aad9012f6d4c2d28898f4d77daa4dadece39275383e35b6a84e9bb
 DIST kglobalaccel-5.43.0.tar.xz 83816 BLAKE2B c1fa3aed1e2a0ae9b426b8e53f3b6cb903e329e19eb2efe3add7b337d8383901d2d578114861f0aff00b511d327f9fdb806795879cb2945fd4e389267ab89ee4 SHA512 1b10d9e5c454b1a4c9fb2553fb1847e30ada2b36050a4fd13637c9a1ba2cff642b19c2934414fc5e104958856c0d0dae4d20b8fdb6f51454125b0e2941fd1d22
 DIST kglobalaccel-5.44.0.tar.xz 83772 BLAKE2B 73e608a983dfc1333b717dd43592f7f6977bb88c73a9fe42e0aab72530468b9c763318ecf856e21f7f3eb1be224708a2eb1de7fb8c970a4d7409362ff44fa22d SHA512 02a37fc358bb802e3ad5a9851002c53c7f54adb2078692b4e344a9fbb15438922e625f994715e1d9bfa08b3a97df336c08804aecddbc73be3cedf35ba8b0d174
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.40.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.40.0.ebuild
deleted file mode 100644
index 64390bf598cc..000000000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.40.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-LICENSE="LGPL-2+"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.43.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.43.0.ebuild
index 5e6065dfe91d..7afcfd51eb72 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.43.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.43.0.ebuild
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 LICENSE="LGPL-2+"
 IUSE="nls"
 
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index d9b3407efdeb..a2e5207b0acd 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,3 +1,2 @@
-DIST kguiaddons-5.40.0.tar.xz 40180 BLAKE2B bf8133a926379096e625326a5bf2bb2ba6b347ce8f0205d4bda3378e433e1a1cab838f35da34561fd7781de3941ec21cbca427168a3e1d46c874ff99b98515a1 SHA512 42543c4b29355d5998abd4bee14530a9e96b7d3f4378ea11952af67a157be23acf45b5c801e80909546e7903c73df3a650a05fa6ee8594a2cbe9e8ce66146976
 DIST kguiaddons-5.43.0.tar.xz 40100 BLAKE2B 8730eac13e790ab3baf80e7c6c98c152ade022401651851f4cec3bfcd96db99323937d03e30b546cbe37bc6241c2ccd1ac9109ee10d8c70e6c0671ed30ff04ee SHA512 ea560ba016914037ddad6d07da849a1f9b20d241a7d5e21353237e00e960d5ca5005de3bc95db67e0ff1d432b0a52b99e8d7f85a0930ec40ff1fddf932a15e41
 DIST kguiaddons-5.44.0.tar.xz 40108 BLAKE2B 485bc49c862e9800723758a909982e347516725aef71b8e5f725f85f1b551eb27ae36dfdaa888ef5dd30cfc726c97e2a9e143ebd03f6bd5fe94bfa99a5fd0a5a SHA512 ef87a5f40d77de65445b3a17a96a77fe1493c2836bd192cc89099bc5cce6ca4466e8d04a04828e77e340fefa594b4a9c8cd8bd674d0a7733f1226f0d88fd6877
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.40.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.40.0.ebuild
deleted file mode 100644
index 3430e1b6453c..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.40.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-libs/libxcb
-	x11-proto/xproto
-"
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.43.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.43.0.ebuild
index 68c87545da44..0eabc96f79bb 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.43.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing assorted high-level user interface components"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kholidays/kholidays-5.43.0.ebuild b/kde-frameworks/kholidays/kholidays-5.43.0.ebuild
index 1fbb3b26dce1..0a402a07e9cd 100644
--- a/kde-frameworks/kholidays/kholidays-5.43.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library to determine holidays and other special events for a geographical region"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 7fad02c5ae15..1d81e8210198 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,3 +1,2 @@
-DIST khtml-5.40.0.tar.xz 2081588 BLAKE2B 14fa9c0bb27263bdd4be9663575569a7ceac8f7699cdc7ac67e6a9df7464549155d7348b51490cabd87e1e0b8028cae361f7d88bdf6e90bdae015c05739c9cb2 SHA512 e64cc9c32944c6cd1f45c745f4e653ca1b6023061ede3ed87886e3ed95e9d2d7a7753b396631d256b7f1a4c34b788e9a9b80253f151f73b3fdec3f862f8adcef
 DIST khtml-5.43.0.tar.xz 2082356 BLAKE2B 2bacb4b466c6071a0fbad52293db80e1d002cdb275abba2279326460ca583284b8fd568b6fa3ffcb32f0dcefbc3383aadfa2a0eabf2e0d2d7d2230b0f6022e6f SHA512 55d2806c28d5da5999bb3ba03d33ef026c1c3fefcd1a76c6e74ecd2f659a015f55b2fd1fec34efcddf25fb2e921b4c76358d37498fc3429b6bcf6e5e790f7cd8
 DIST khtml-5.44.0.tar.xz 2082252 BLAKE2B 21055f86368a245b13c250085c21b4f0c17c8cc2d36c4e350125aa5805a1a241e359d287d58fac86d1c4ce85111850ac3d08ba71cb4e28d1b7a00b74e2da8d72 SHA512 b90beda67951c3d23d00d42863f5dd2b78017859f315514fc4361d2917bb1bc86a810920b84b1fbb6e741d196802d04f281892f08b9e39be2363f9d1a0452770
diff --git a/kde-frameworks/khtml/khtml-5.40.0.ebuild b/kde-frameworks/khtml/khtml-5.40.0.ebuild
deleted file mode 100644
index 06225c070363..000000000000
--- a/kde-frameworks/khtml/khtml-5.40.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="libressl X"
-
-RDEPEND="
-	$(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 kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	virtual/jpeg:0
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gperf
-	test? ( $(add_qt_dep qtx11extras) )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/khtml/khtml-5.43.0.ebuild b/kde-frameworks/khtml/khtml-5.43.0.ebuild
index 0252c7e3ccc8..28e890708837 100644
--- a/kde-frameworks/khtml/khtml-5.43.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KHTML web rendering engine"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="libressl X"
 
 RDEPEND="
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 16cb0fc40475..b34e7ef14ac5 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,3 +1,2 @@
-DIST ki18n-5.40.0.tar.xz 586876 BLAKE2B 22878b121d8894b5e90db831fa13c41d1ff13d6065281c2d2169c973e6f94aae94faafc714f67f49f873f02b10b54a3080b89e3f6be22a1e0f6760106f7e09e5 SHA512 cfdabb1c22d0ae275c274b4e0d40af94305364bf69a8152c6d9064dcc4d5b8d208eace8b2679c4eb97f095ce5af5582350fec1564ace049d2f63e852b4249bd3
 DIST ki18n-5.43.0.tar.xz 587360 BLAKE2B b8a91fc909f7385648f1c658599d63dcabceefd2270efa78b71acad56b917008810a69fa9c3ce2996828bbe0ec2d3456e7127f6480b4aa2cbce719d301c66bba SHA512 14b7f632feed5c71a44259b4f0d9cc11ab72d7f132a59fba597e048efee7a4ff360eb01b95c5b4957ca28ba8ab0e2cf9ed752cd146f6dc19855c6c78c05a7e6e
 DIST ki18n-5.44.0.tar.xz 587300 BLAKE2B f14f92b1da7b2d7790cfbb5a8af5eb90c80bbf25847294729ee4a37c24657dd71ee046abf63a267987914d146371bfdd8fc505b99c6a7fb815ad3bad450f2aef SHA512 92acb91807970f83182f35a3f356e8b9b70e7b3e1b07347ab4f16ef3200d5d95b6819218891b66bd43eee3efa5c17ee4c91c195ef1a05440b6dec7c34747ffa5
diff --git a/kde-frameworks/ki18n/ki18n-5.40.0.ebuild b/kde-frameworks/ki18n/ki18n-5.40.0.ebuild
deleted file mode 100644
index ced08c4f6452..000000000000
--- a/kde-frameworks/ki18n/ki18n-5.40.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit kde5 python-single-r1
-
-DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(add_qt_dep qtscript)
-	sys-devel/gettext
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(add_qt_dep qtconcurrent)
-		$(add_qt_dep qtdeclarative)
-	)
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	kde5_src_install
-	python_fix_shebang "${ED}/usr/$(get_libdir)/cmake/KF5I18n/ts-pmap-compile.py"
-}
diff --git a/kde-frameworks/ki18n/ki18n-5.43.0.ebuild b/kde-frameworks/ki18n/ki18n-5.43.0.ebuild
index 8f03e6fd4a5f..9fc6e2652145 100644
--- a/kde-frameworks/ki18n/ki18n-5.43.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5 python-single-r1
 
 DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 931578f4549f..c978ee5f6fc8 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,3 +1,2 @@
-DIST kiconthemes-5.40.0.tar.xz 205516 BLAKE2B 53d952fa3311bd251ec46d6a1f81987c2f3ba457f846108ebe1921dad4564cace85549c6b4277142eee828c8e501bedf598bd4ea513b1200d1868b3b5b078d4a SHA512 bed22e1e1173e5838a43cce8305b0df3b6c7f5f90d958feaf14a8a9612de2d81bdc57a2e6807ac9375cdd8a96a433672484a931ec30c6816ba58f752b2b8c2cb
 DIST kiconthemes-5.43.0.tar.xz 205472 BLAKE2B 861618940ffff5d4779254d198f347d52a83b0bb1b60c5c537d13c0283802c033611334ac6a80bf994f47d64d542196126586603ff7d3646c31040e30effc916 SHA512 742a2c79b37830e319e4d807359e9bd16950889753a46f85ee5b8d5e0b1dc6868aaafc625c3df7717371440a1cf4e6168981ec34dae328aa3eb1aecc7962d759
 DIST kiconthemes-5.44.0.tar.xz 205476 BLAKE2B faa9ad637931e1951d3a6972748af2045f72e14b6dcf26af61fee3b4e6d3bddc87f1ed42b9c7813404fdfe1601629eeb77c2861e38994b1ea9524f30d59dd742 SHA512 d48c081050746109a9303453b210a7ccc7e41db4d279b24e363ffd921621bec5aad885458720f2d87e62843d6335b1f1f78307814a54e01657d93fd37f5af5db
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.40.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.40.0.ebuild
deleted file mode 100644
index 70c356db2671..000000000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.40.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for icon theming and configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT+=" test" # bug 574770
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.43.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.43.0.ebuild
index 56a0ecb3948b..5824a175b1a5 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.43.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for icon theming and configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 4132f529d63d..add276ca2dec 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,3 +1,2 @@
-DIST kidletime-5.40.0.tar.xz 26616 BLAKE2B 17c3e7d87156ad732f38ed0e4d0bdc4e4eb816d10686fd084a553216ba8ac4e5d0fc35590d5bcccb9deb100619539e79ec417643c31105e26b13ba392ff702b0 SHA512 b8c8c1de1c2261ad52ba80a11388a90ffa18c80153b58b0063184e14fe1c744465c150ef4e9be6692ca81330c52230029b406e8ae240e6738300f8977411a6ba
 DIST kidletime-5.43.0.tar.xz 26484 BLAKE2B 5c7aca43bdaa77b87fa739c128a103ad1ffb1462d459cfb0bdef17d96540c7c9b4c29cdb68156bee61d7421355c6ea1513e592d3e0451c6007b6750e0b1e318c SHA512 aab85a3143fce87751cd3e9c2b55306f5c4aad1f396dbdea7678605dab4ce47b53b95a42d42667fea937dbd6b20b84c349d00076216753dcb31beab52d05df3d
 DIST kidletime-5.44.0.tar.xz 26484 BLAKE2B 3fa9d62985ade5748a4786db7ac793cd3a6978e23a08165ae91c9abfabea1cbe3c8051b7f8bd5cfaab29da634791e650e9f2e43a4d38cc2da51c88900f65b251 SHA512 6416ad41958ab055f2b4177011cb670f623b12c82b8dc549c2db804e60c4d5088f44477eb70e60679923a6b1ce768b44181534dd37330f547085f91fedd65b9a
diff --git a/kde-frameworks/kidletime/kidletime-5.40.0.ebuild b/kde-frameworks/kidletime/kidletime-5.40.0.ebuild
deleted file mode 100644
index fbdfe676f23f..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.40.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="X xscreensaver"
-
-REQUIRED_USE="xscreensaver? ( X )"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libXext
-	)
-	xscreensaver? (
-		$(add_qt_dep qtdbus)
-		x11-libs/libXScrnSaver
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-	if ! use xscreensaver; then
-		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kidletime/kidletime-5.43.0.ebuild b/kde-frameworks/kidletime/kidletime-5.43.0.ebuild
index 10865cb9fe0d..b125a74775cf 100644
--- a/kde-frameworks/kidletime/kidletime-5.43.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for detection and notification of device idle time"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 923103577ff0..abd9ad828e14 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,3 +1,2 @@
-DIST kimageformats-5.40.0.tar.xz 204748 BLAKE2B ff8d45dea9694d0b20f3320c12b295dfa5846db85a19f6c28b37f530c8d2b97026533d33fd15d88f78c7d148fa4310649d7cf71a9ae94e53cd2f1b0c07f17b53 SHA512 e971d02b34c1a63d9ccefb10e5c12b21e6a68330230ca06fd7e55b390fec6ef7937b5e404b446b9ec65e5b1f962a601c1ec03a7783d1e06f004ac5f6ff428ea4
 DIST kimageformats-5.43.0.tar.xz 204688 BLAKE2B 24f5cec1d55c2f4def2dfd50f62e414e0943e042c947302946b0687784a2f6c5fac35a13e7efd279732f1af83b2f7b916435de0cac01082698e5aca2f6ee07b2 SHA512 1b968ebbfb08e1f22f1e15e6dcc66753799b125f568eb011bab1071b3cde780bbbb9ee94861e1e7d6fddf76a7ba6e1e9a54fd1c6bed6898840a3b2a0c1a62fe5
 DIST kimageformats-5.44.0.tar.xz 204892 BLAKE2B a1c864a7a659a068139c95dd80fc7c53ecb6920c8aa55979cf9ac1e8bf368c28e79e6a3310c4b3c27f9a69bfc662ab103bc0b5097de0004ecd8224fe82f577c1 SHA512 83eee710ed989808bebb15df184ee7f8ff2f51925855fb3479b354ea978cd6adc59a90cec24a278afdcabb8aed2eec087bdfd5742b78a01d7b8ce4961c8c7c96
diff --git a/kde-frameworks/kimageformats/kimageformats-5.40.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.40.0.ebuild
deleted file mode 100644
index 41646de9e147..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.40.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE="eps openexr"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_qt_dep qtgui)
-	eps? ( $(add_qt_dep qtprintsupport) )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package eps Qt5PrintSupport)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kimageformats/kimageformats-5.43.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.43.0.ebuild
index 21e44999c4b8..625d5e54f92b 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.43.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="eps openexr"
 
 RDEPEND="
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 71afdff9bad2..98b5528c4dd2 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,3 +1,2 @@
-DIST kinit-5.40.0.tar.xz 120920 BLAKE2B 0bf69e2440a21a1c803859080825e9e25b3657c8f7114701fb62f448982da9bbd830faea8b2654e60c7a1602bc55c56dd4d25a10179408a01a46694c09198e46 SHA512 1bfa884726e4379d9e0246e283dd7867bb404416eb90226f644b46e06c4bc17c898470bddafaf9f6ba9fc6be5ea4d975cacb0e5fc5ea4d1038616e91e7ddcb07
 DIST kinit-5.43.0.tar.xz 120776 BLAKE2B 72430d23c4ff0efb02b7f2e49388ab7e79b99c9c181435dc026424e83da7d6436ea554c6d4a7d88abdbe357c09437f457b6949c1bac332b535eaa76fdcd74a95 SHA512 1326c6a3d67d5ff9e483f05506c4c21486377c793fb6e6e8f6657d60f28b69bc03bd45619783a76464971b81997b1f546f18043f133f048c4836c023f2ba54f7
 DIST kinit-5.44.0.tar.xz 120716 BLAKE2B 2e28ecd01ead142bb95cd7e84e2b739ad627231f83f36e086c2d21c35562611d46e74985acf2e163547193bceaf575da2c6b574daefa34e365759930244f869d SHA512 64d4709faafce326d56e907cbd79673f3947a4ef7e52c520d6d26bf0c8232e8b5826619a1bc04639d1a0f0a9a06b2da48f8867c2b66e593b11f526677a308857
diff --git a/kde-frameworks/kinit/kinit-5.40.0.ebuild b/kde-frameworks/kinit/kinit-5.40.0.ebuild
deleted file mode 100644
index d52938304e58..000000000000
--- a/kde-frameworks/kinit/kinit-5.40.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+caps +man X"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	caps? ( sys-libs/libcap )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-		$(cmake-utils_use_find_package man KF5DocTools)
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kinit/kinit-5.43.0.ebuild b/kde-frameworks/kinit/kinit-5.43.0.ebuild
index f547e317952a..87e146a7beea 100644
--- a/kde-frameworks/kinit/kinit-5.43.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+caps +man X"
 
 RDEPEND="
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 1437e1cdf890..0baec954d7f6 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
-DIST kio-5.40.0.tar.xz 3100424 BLAKE2B 27f69f10febc327d1f935e2b8f3c24dc8b64e85ef35830841f99fdefb6238f590dc8a1284bd0896d6e0e2eb86f123e6788ebd277ca208df18312e8ac475221dc SHA512 e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed
 DIST kio-5.43.0.tar.xz 3139276 BLAKE2B 1fbaf93e7bd3565ff5c85a8a3e33b3dbe2e7a4314cb866711a3be72bb8f1eb320fb3a6c9af421914b440787cdee393ca3762ffd8ac881e2427f8f3e5c47e739e SHA512 23885d851dade24bb08ba1de2eda65db3ab13c8f378a42281f8a50230c9e836b5255643c89fbfca3dedc1e41ee259e67aaed2933cdf739ee4fb1c7eb650b95f6
 DIST kio-5.44.0.tar.xz 3145388 BLAKE2B 0e76a55706cc0f487752967b29495e1b706181e607760afc4ac922bb54889003b8fb9cad1e5847254558b243efc1567ab8da7d0b18416990856cfaa720972784 SHA512 ec50fce1b60eda5ba637abd37a14e10d853bbf35be2d1ef48ee69681ed2f5356d919e06f0156558187f0e7bc5f642790e72af6f7554a1c72ffd445d22844429b
diff --git a/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch
deleted file mode 100644
index 9645620d04d7..000000000000
--- a/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 298c0e734efdd8a7b66a531959e3fb5357a6495d Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein@kde.org>
-Date: Tue, 28 Nov 2017 19:42:46 +0900
-Subject: Fix creating a directory via KNewFileMenu+KIO::mkpath on Qt 5.9.3+
-
-Summary:
-f62768d04652 in qtbase.git introduced a behavior change in QUrl
-causing it to reject URLs with a path of "//foo" (note the double
-slash) as invalid.
-
-Both KNewFileMenu and KIO::mkpath contained code following this
-pattern:
-
-  url.path() + '/' + name
-
-This is a bad mix with forwarding slaves like kio_desktop, which
-translate a top-level path of / to some other URL:
-
-  (desktop:)/ + / + foo = //foo
-
-This patch addresses the two instances of this by wrapping the
-string building in QDir::cleanPath, which I think is the shortest
-and most readable way to go.
-
-2353119aae8f in kio.git (D8836) was another commit fixing fallout
-from this Qt change. Is unlikely this patch will be the last one.
-I suspect many other variations of this problem lurk about the
-codebase.
-
-BUG:387073
-
-Reviewers: dfaure, thiago, elvisangelaccio
-
-Subscribers: #frameworks
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D9029
----
- src/core/mkpathjob.cpp           | 3 ++-
- src/filewidgets/knewfilemenu.cpp | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/mkpathjob.cpp b/src/core/mkpathjob.cpp
-index c77a9fe..f67a489 100644
---- a/src/core/mkpathjob.cpp
-+++ b/src/core/mkpathjob.cpp
-@@ -25,6 +25,7 @@
- #include "mkdirjob.h"
- #include <QTimer>
- #include <QDebug>
-+#include <QDir>
- #include <QFileInfo>
- 
- using namespace KIO;
-@@ -123,7 +124,7 @@ void MkpathJobPrivate::slotStart()
-     }
- 
-     if (m_pathIterator != m_pathComponents.constEnd()) {
--        m_url.setPath(m_url.path() + '/' + *m_pathIterator);
-+        m_url.setPath(QDir::cleanPath(m_url.path() + '/' + *m_pathIterator));
-         KIO::Job* job = KIO::mkdir(m_url);
-         q->addSubjob(job);
-         q->setProcessedAmount(KJob::Directories, q->processedAmount(KJob::Directories) + 1);
-diff --git a/src/filewidgets/knewfilemenu.cpp b/src/filewidgets/knewfilemenu.cpp
-index 023eebd..98c9852 100644
---- a/src/filewidgets/knewfilemenu.cpp
-+++ b/src/filewidgets/knewfilemenu.cpp
-@@ -855,7 +855,7 @@ void KNewFileMenuPrivate::_k_slotCreateDirectory(bool writeHiddenDir)
-                 }
-             }
-             url = baseUrl;
--            url.setPath(url.path() + '/' + name);
-+            url.setPath(QDir::cleanPath(url.path() + '/' + name));
-         }
-     }
- 
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
deleted file mode 100644
index 503a8c773780..000000000000
--- a/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 2353119aae8f03565bc7779ed1d597d266f5afda Mon Sep 17 00:00:00 2001
-From: Elvis Angelaccio <elvis.angelaccio@kde.org>
-Date: Thu, 16 Nov 2017 10:41:19 +0100
-Subject: Fix KIO::mkpath with qtbase 5.10 beta 4
-
-Summary:
-The latest Qt 5.10 beta includes [1] which breaks a bunch of unit tests,
-since `url.setPath("//foo")` will now result in an invalid (empty) QUrl.
-
-This patch fixes the KIO::mkpath() case.
-
-[1]: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=f62768d046528636789f901ac79e2cfa1843a7b7
-
-Test Plan:
-
-* I can now create folders from dolphin and plasma.
-* fileundomanagertest and mkpathjobtest no longer fail
-
-Reviewers: #frameworks, dfaure
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D8836
-
-* asturm: Fix build with Qt-5.7.1
----
- src/core/mkpathjob.cpp | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/core/mkpathjob.cpp b/src/core/mkpathjob.cpp
-index bff46ca..a177805 100644
---- a/src/core/mkpathjob.cpp
-+++ b/src/core/mkpathjob.cpp
-@@ -43,8 +43,13 @@ public:
-         m_url.setPath(QStringLiteral("/"));
-         int i = 0;
-         for (; i < basePathComponents.count() && i < m_pathComponents.count(); ++i) {
--            if (m_pathComponents.at(i) == basePathComponents.at(i)) {
--                m_url.setPath(m_url.path() + '/' + m_pathComponents.at(i));
-+            const QString pathComponent = m_pathComponents.at(i);
-+            if (pathComponent == basePathComponents.at(i)) {
-+                if (m_url.path() == QLatin1String("/")) {
-+                    m_url.setPath(m_url.path() + pathComponent);
-+                } else {
-+                    m_url.setPath(m_url.path() + '/' + pathComponent);
-+                }
-             } else {
-                 break;
-             }
-@@ -57,7 +62,13 @@ public:
-         if (m_url.isLocalFile()) {
-             i = 0;
-             for (; i < m_pathComponents.count(); ++i) {
--                QString testDir = m_url.toLocalFile() + '/' + m_pathComponents.at(i);
-+                const QString localFile = m_url.toLocalFile();
-+                QString testDir;
-+                if (localFile == QLatin1String("/")) {
-+                    testDir = localFile + m_pathComponents.at(i);
-+                } else {
-+                    testDir = localFile + '/' + m_pathComponents.at(i);
-+                }
-                 if (QFileInfo(testDir).isDir()) {
-                     m_url.setPath(testDir);
-                 } else {
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch
deleted file mode 100644
index f3e1112720da..000000000000
--- a/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 05938a167dd4190014d800bb02446e2779a9b3b2 Mon Sep 17 00:00:00 2001
-From: Elvis Angelaccio <elvis.angelaccio@kde.org>
-Date: Thu, 16 Nov 2017 12:06:41 +0100
-Subject: Fix testtrash with qtbase 5.10 beta 4
-
-Summary:
-Same fix as in D8836, this time for testtrash.
-
-Test Plan:
-Run testtrash.
-
-Reviewed By: dfaure
-
-Differential Revision: https://phabricator.kde.org/D8837
-
-*asturm: Fix build with Qt-5.7.1
----
- src/core/listjob.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/listjob.cpp b/src/core/listjob.cpp
-index 4b7b510..54a422a 100644
---- a/src/core/listjob.cpp
-+++ b/src/core/listjob.cpp
-@@ -117,7 +117,11 @@ void ListJobPrivate::slotListEntries(const KIO::UDSEntryList &list)
-                 itemURL = q->url();
-                 filename = entry.stringValue(KIO::UDSEntry::UDS_NAME);
-                 Q_ASSERT(!filename.isEmpty()); // we'll recurse forever otherwise :)
--                itemURL.setPath(itemURL.path() + '/' + filename);
-+                if (itemURL.path() == QLatin1String("/")) {
-+                    itemURL.setPath(itemURL.path() + filename);
-+                } else {
-+                    itemURL.setPath(itemURL.path() + '/' + filename);
-+                }
-             }
- 
-             if (entry.isDir() && !entry.isLink()) {
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/kio/kio-5.40.0-r3.ebuild b/kde-frameworks/kio/kio-5.40.0-r3.ebuild
deleted file mode 100644
index e850e493306a..000000000000
--- a/kde-frameworks/kio/kio-5.40.0-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing transparent file and data management"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	kerberos? ( virtual/krb5 )
-	kwallet? ( $(add_frameworks_dep kwallet) )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	handbook? ( $(add_frameworks_dep kdoctools) )
-	test? ( sys-libs/zlib )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-proto/xproto
-	)
-"
-PDEPEND="
-	$(add_frameworks_dep kded)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-mkpath-qt-5.9.3.patch"
-	"${FILESDIR}/${P}-knewfilemenu-mkpath-qt-5.9.3.patch"
-	"${FILESDIR}/${P}-testtrash-qt-5.9.3.patch"
-)
-
-# tests hang
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package acl ACL)
-		$(cmake-utils_use_find_package handbook KF5DocTools)
-		$(cmake-utils_use_find_package kerberos GSSAPI)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kio/kio-5.43.0-r1.ebuild b/kde-frameworks/kio/kio-5.43.0-r1.ebuild
index 6688a725275a..186e877e8c34 100644
--- a/kde-frameworks/kio/kio-5.43.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.43.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 RDEPEND="
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 8944af0cc808..a382825f21cd 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,3 +1,2 @@
-DIST kirigami2-5.40.0.tar.xz 291456 BLAKE2B d00d9df6880c45b1c74430fdeb9e09d2e7292e6b9512213969e5ff8c5668df1cc85b3c0116a86f546ec11f8e96a2a66fa599c29d46efafa3e2bd7db2a9329071 SHA512 689d91f23a1300afd9204173a40e2a100e83b0eb38d02962236ab1ff91fd4659dcc60d84c815766a38cacf38294488d82c5d0b9d540c1a0972489aa29e300974
 DIST kirigami2-5.43.0.tar.xz 299820 BLAKE2B d005686ad99cce4e99d963cf3ee23c27aaabd8d7e0123407a1ef73fc8115a8498e9ff085975066f250f479bfb90e3924a4046c6897096cf124b68db4fc868a5c SHA512 a41a139170853853fd7520912eac273e0cff8b5b798e41fd44cff528d210703b650e86ef9c8e67d8b8f14b89ed63b419e71cebe0e499ed32e9374e9346013c3b
 DIST kirigami2-5.44.0.tar.xz 301668 BLAKE2B f4380154040a2b6f086413549ba194e3c44eb085c712690d7d3b93d5344776afa76bff599859441f420aff669622e0e22527261d43e453ddabbcc7c7b54e0832 SHA512 e0ea37fac3805449d691f1dcd7f3acb298c77552d42e94045d43ca62251932b6f1f0a48da4c1e60d1252819bc7f470afeffb4f00baeb041307886b2fea89e432
diff --git a/kde-frameworks/kirigami/kirigami-5.40.0.ebuild b/kde-frameworks/kirigami/kirigami-5.40.0.ebuild
deleted file mode 100644
index eff2dca960b8..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.40.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_EXAMPLES="true"
-KDE_QTHELP="false"
-KDE_TEST="forceoptional"
-KMNAME="${PN}2"
-inherit kde5
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE="plasma"
-
-RDEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtsvg)
-	plasma? ( $(add_frameworks_dep plasma) )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-# requires package to already be installed
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DPLASMA_ENABLED=$(usex plasma)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kirigami/kirigami-5.43.0.ebuild b/kde-frameworks/kirigami/kirigami-5.43.0.ebuild
index 9ade1268bf71..832d5fbae744 100644
--- a/kde-frameworks/kirigami/kirigami-5.43.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.43.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 5b7f58d3c0cf..51c8a2e845ea 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,3 +1,2 @@
-DIST kitemmodels-5.40.0.tar.xz 389628 BLAKE2B 42ec268ca734db5dea7a380de739036028683e421a79987dec94c6f8243f9f6beae3d35c78c6be63d927328b69c171c8792b3dd1c078bfc3555faf871e0ea562 SHA512 17f78419b5860b6423a555d5ab529f68e7589e76b1f0c32f5ff0f581991a480cd9424d86d1384a85c221bb3037491a8fa4a0bf1e20ee7ed046d9be8c76e74446
 DIST kitemmodels-5.43.0.tar.xz 389768 BLAKE2B da182b244676db2e26828f6c66a3b5616d98377204f9479af506a172994d50982845eab345b85cbfd3a91d0684e13d2a324d165f15056601e511c2fc7efccec3 SHA512 8bc5d6d43abede2478d1e67516cd89e16c0033ea762c057047e898a4d31542ca4e1d7c2bd6e2d4e5cf1cf2c22113f5d69f7a25d022fcc47fabf51364a26cef8d
 DIST kitemmodels-5.44.0.tar.xz 389772 BLAKE2B 0bc20619e3700026293e9036b238ac53fee10f2b0191da3a5e4210a388d391fa3eea52d036df4e6b6b3cac692e049ce3857705b92ec9d41d5f1ed15f63d7967a SHA512 82869310265c0769c683c365403d8c04cb0025e50dd71cdf1d7298731a40a808ed34a87f76e8e5ab012c77c8ed596460b8849bc1f9dbce583ffcf5f629539674
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.40.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.40.0.ebuild
deleted file mode 100644
index 852c94e76472..000000000000
--- a/kde-frameworks/kitemmodels/kitemmodels-5.40.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="test? ( $(add_qt_dep qtwidgets) )"
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.43.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.43.0.ebuild
index 90d5d027232c..e5798aaf579c 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.43.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="test? ( $(add_qt_dep qtwidgets) )"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 3f37cbfc03c0..c857fb318b1c 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,3 +1,2 @@
-DIST kitemviews-5.40.0.tar.xz 74968 BLAKE2B d7a72f6902d6af9105e5a122caf76e4b703775757cecf9c03c0d1349a498f59811f5112c6785c07810cd7e137122fc26bd6dd90708839938e3359d762f53548b SHA512 54e7f7fe422c0750a20b9cbf4a44c8865513574ae79afea8a2bac70637d293514b0f3a386567fcb6ad559da18ff9a6589d5b55bdf8411606ad24592c857a110c
 DIST kitemviews-5.43.0.tar.xz 74880 BLAKE2B 789e8974697ea6550490cec36d2fcd927dfa1b6852fe3399187b1f60a3cae28a791275b76f21540801b0f00da1826878e3515070243bc1aa317d29f2391d8371 SHA512 e54af77d29d1aad0a1e0d842d82a23397f98bc2c146d74c6f1609af66099b0b7413b7d33ae1749036e90db54b1f2217d534d598ddead00be31934a6973a77a05
 DIST kitemviews-5.44.0.tar.xz 74912 BLAKE2B 846c46e982e65367bcbee2ee5d03af47b8ae01d070589f246080ea681c887db880f2add5ed31a8349571f8b824b21d8aabd54961320de1711f80208e40a272b7 SHA512 c43c5507e6e4ca465f816349261b90e9110aeb2ba5cc88c547cd081465c6f0ebb15377382609da9e312766734100d6d05b4d23e70e8bab7227a62d42cf69b93d
diff --git a/kde-frameworks/kitemviews/kitemviews-5.40.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.40.0.ebuild
deleted file mode 100644
index 773bc1eea7c6..000000000000
--- a/kde-frameworks/kitemviews/kitemviews-5.40.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing additional widgets for item models"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kitemviews/kitemviews-5.43.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.43.0.ebuild
index 029a533f9ea9..a24457989834 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.43.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing additional widgets for item models"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 64308b11d9f3..3dcf90088200 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,3 +1,2 @@
-DIST kjobwidgets-5.40.0.tar.xz 90004 BLAKE2B 2b30c58bf3b4e918190bb54e2a8a33de6d4428aa7d5d6b200b3b61474e9a948941b9926383a1aa2da6611f7b607f6da99b350803c94ae42570850a98acfff57d SHA512 ee0fe25fe1c8faedfa834f7a381e8e15dbde3adfb9c6aacef362c39b251a2a3ec84c966c9cfde7ef906a5bfa7bff71d3c5cf374e0d949fb4d18224afebd09c33
 DIST kjobwidgets-5.43.0.tar.xz 87696 BLAKE2B ee87fbd21365c79a8514c048feba4542a361c870767e1ed7aa2aaa6d6d7a47eeca62370107e42a1b7f36c368f5949fadbba5737995e022e781d17311fbdf7673 SHA512 41a8a7c9c81f66eb90c196dc05e6159948c30bc1957fc99c477aa56e25f714665d6b5a1af381ebdd1194e4f2a7a68f8975e48d09d98771d67e899ae542d5f6af
 DIST kjobwidgets-5.44.0.tar.xz 87560 BLAKE2B 600cdce8453cbee2314cb5a97173aa73c2fea4224cda2edf83af8f6a122e2bd2ab8b44bbf34cca2336f2dd910d0ea62669f62688703303b8273dd4086167d9f4 SHA512 9a78b36e0a7683ca65cc900caf486713514f9ae219bb31015693b0c7f93d604460ce685ea567b11364171031c9d66e8adde87e395ffe2f793afdc5bd45ada688
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.40.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.40.0.ebuild
deleted file mode 100644
index eca0684289a2..000000000000
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.40.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls X"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	X? (
-		x11-libs/libX11
-		x11-proto/xproto
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.43.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.43.0.ebuild
index dead1c175035..600d5fda06fd 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.43.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls X"
 
 RDEPEND="
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index abdbb3b68d03..31b11a2df788 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,3 +1,2 @@
-DIST kjs-5.40.0.tar.xz 294940 BLAKE2B f2b3219dd32669e0fa4e46112339f4b87dd4d1f9a417700a1ff28870ff9f11d3eae56d76ab48ba6277b13c93cdb15f4e43a6018c1db69b007295c42e1c35488f SHA512 a9db958cb99f47d8fbc428ace36f050e191f47058ae1fc7f9f4f7bdb8d763e65870a79a1fac504706d26d1d5bbb1988543235519a1cefa46ca4e6e14323208b5
 DIST kjs-5.43.0.tar.xz 294820 BLAKE2B 552dcdbd40454690df207e29675af687ea0f06e06f8165dd59a46524611ed42806d761cc86479ad55aa8baf5597aa447517abacb56139ea125c48fc891a5ce5e SHA512 44b52dbeed8d23972eefa9f2a68a6a0f15352c54fe5a8a1563d750899740044dd4539c8b5f6f42a196bd8d3216862437b36c6fd9aa65c653691c1f7ce9428772
 DIST kjs-5.44.0.tar.xz 294760 BLAKE2B 8c492d98abaf5f5386eeb9bad4f058160a88bd040dcef9ce246aef408644d4fca049f20d79f3cc59e3b96d9d2bba33b5e453abf95f5114c206bf61526ac85bb6 SHA512 5fe5ae87f9fac4c423d68c1a3ed0b5d256bded92426e0b4c64452f7689fa681e3c43507e47159bdd670fcd3b10f2e7ec6d83c3f031de8d380293b79938982e91
diff --git a/kde-frameworks/kjs/kjs-5.40.0.ebuild b/kde-frameworks/kjs/kjs-5.40.0.ebuild
deleted file mode 100644
index a23fe7f246f3..000000000000
--- a/kde-frameworks/kjs/kjs-5.40.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="ECMAScipt compatible parser and engine"
-LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-lang/perl
-"
-
-DOCS=( src/README )
diff --git a/kde-frameworks/kjs/kjs-5.43.0.ebuild b/kde-frameworks/kjs/kjs-5.43.0.ebuild
index 2de6494c7ae5..914105dfeb21 100644
--- a/kde-frameworks/kjs/kjs-5.43.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="ECMAScipt compatible parser and engine"
 LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 146681be2973..6c3da95a7eb3 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,3 +1,2 @@
-DIST kjsembed-5.40.0.tar.xz 169680 BLAKE2B 37175390368c9a2e28e02d699b7bc70c583b4bd32852c0ad963b9249dd26d359e3c0aaaf8fe665bbe30523ea2f0505664c5fde598f694a5f76a4db2ee432b7a8 SHA512 4b14d85bf5d67f61eea08eba31e4c3891c418f9bd7af931c6c643672b765ad0714b39da23f8ec57e2d752cabcd04db5647cf1a088f8bdc06be5f606d93297078
 DIST kjsembed-5.43.0.tar.xz 169476 BLAKE2B 9025a034f99b43889ebe0e83e44e380b280a5a6a1a990b3fa52a0349e4288ebfb75520457eadc920152f5c185df31aa242a728368158726959e238ebdaf05d90 SHA512 54c005f1cdd60a3cedbe636d8abddfe92967ff27ac91086d9e7c0cf9983ef643547c04bde85a5e0558f51c0e68f85900db26ddb627c084396f750da22d30d549
 DIST kjsembed-5.44.0.tar.xz 169460 BLAKE2B a8de31d6e4c2ef720d3451df48375fdd5660e20e9f9bc0d304950dd23f334ed879e462295a0527354c6f482269c80822c00794196b58e85eca2d62824ad58ae1 SHA512 b81f68db4bf404ad5fed94ae90e66020f21253b754abac1f927812814fb2808cba32b56dd30622cff440c081e14f2ea2b3ee86bce8046625f8bb783371018095
diff --git a/kde-frameworks/kjsembed/kjsembed-5.40.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.40.0.ebuild
deleted file mode 100644
index 7b1549b58f4f..000000000000
--- a/kde-frameworks/kjsembed/kjsembed-5.40.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework binding JavaScript objects to QObjects"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjs)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_qt_dep designer)
-"
diff --git a/kde-frameworks/kjsembed/kjsembed-5.43.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.43.0.ebuild
index d92227a6ecb1..3ffe812f95fa 100644
--- a/kde-frameworks/kjsembed/kjsembed-5.43.0.ebuild
+++ b/kde-frameworks/kjsembed/kjsembed-5.43.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Framework binding JavaScript objects to QObjects"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index d53cbe93eee5..626d650d0ba4 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,3 +1,2 @@
-DIST kmediaplayer-5.40.0.tar.xz 9616 BLAKE2B 21832541f6b4cc8b1b79c6d3db0a197b55631b202fb380c20982b0ba2623742a3de381dec49a9de6de548c248335cd381fd6afbfc1824dbb2d4e402e84c23015 SHA512 69e782b366a957d7849c5d995844d6e4ed52dbb7a1ab835d7dcf04c9a50f9337805b0139db81b5e2a787263dda32a223aeadefc45194c2fab7c2de657039df1f
 DIST kmediaplayer-5.43.0.tar.xz 9504 BLAKE2B 337c2d7235a193337550cb2b65d25ace897cfe1d64e14a108866bc12253fc7d55d508d0018d11a0a8a12c260bc88ef9e8e0cdd7d12b29ee73c2e3223925cb6f4 SHA512 2e4a0ad713da37521e236a4e1e6ad8bb1cec63546dcbb9c114a40b3165228ac447d54b0d774c576bd59ece219af5898fa033464c13b14ac82da7ab7e99fb49e2
 DIST kmediaplayer-5.44.0.tar.xz 9500 BLAKE2B 3e624240b1c43c8e93054ed8e33754edda2302ba94ec6edb2020726ad0596f186b8922e9a3d6df961af32583c3cbf92fcb350916c4660cf65555dcbeb8cdc6c7 SHA512 7a19c317eab258a1b04a4b278c07ddec393222173fa5b7182538a528073546fc53c1cdf9b62ee4687dbb42cd8ccefc236fc422edc46bac92e83cb30f56d26b5d
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.40.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.40.0.ebuild
deleted file mode 100644
index dfa2f0ff42eb..000000000000
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.40.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a common interface for KParts that can play media files"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.43.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.43.0.ebuild
index 9bb5a33e13f1..3114d4c16a45 100644
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.43.0.ebuild
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing a common interface for KParts that can play media files"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index ca6e292e51fd..9e462bb9f507 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,3 +1,2 @@
-DIST knewstuff-5.40.0.tar.xz 909280 BLAKE2B 38966edfa402e92e994081afa93b2f410922fd561953bab650bc71a9ecc79ff5fa70a879fa971247d8c6917a6762378c625d79629c9993679806fcbf002f5796 SHA512 496feafb526ee7ae835e5e590f691c86b22bffb2c446de151a6d582662c856f0df755bbbe91fec06c2e06bc5577181972bb95a3f1afcf9aabca1f055e56c42ff
 DIST knewstuff-5.43.0.tar.xz 915856 BLAKE2B 4c3e693a276d2fe6326c50f13ad434b75ca3fd5143455aa503331972ac93d6e07b85bb52ee4e4c7c0c33f34e500f7516c06e7bdee07c8ac888106b5bcfdf7a9c SHA512 27846ef7ff3b1357926ea04df88ecbf9f0810f38077f3ee06dcbb016d4dc76764660fde3f9d40bce1aec381a95700fb5e18844c9895ffefd2237978f282358af
 DIST knewstuff-5.44.0.tar.xz 999220 BLAKE2B bed4f89db95ee8291bb73bd58ebd608066dc4a49aa385076061ab5f6425095622b277c12036da9ff5af67c138a51699f4831512711bc15211263bafcb23ec03c SHA512 f3aabe03152a2bb13e5a44c0b2ea54d858dbc2a35355f9d44cabc3937c5e9fef979e021524df726ffc5d1c0e5e6137637637836883995f6a651dcc817f1438ba
diff --git a/kde-frameworks/knewstuff/knewstuff-5.40.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.40.0.ebuild
deleted file mode 100644
index 612900b587e0..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.40.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-"
diff --git a/kde-frameworks/knewstuff/knewstuff-5.43.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.43.0.ebuild
index fccd68c14db0..db28d4e7cd0c 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.43.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for downloading and sharing additional application data"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 91bb66d303fa..c4a5ae3adf68 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,3 +1,2 @@
-DIST knotifications-5.40.0.tar.xz 99964 BLAKE2B 7ab0dfcca611b28f2f008fa7984a6b7b832ed718d54fd0cbf1b7b810d02ec89bc6f95fb2ffee1d877397ed68abeefdce113a879ad565e8af9cd892aa1fdddba6 SHA512 7fbeff7ce781904ae9d3d57ef439c1d41880558f219465d5b593ee3099d3ce091124067494f5ce9da590ce68ab8f12ac2eda96c59be8d0a767b3edafeb251675
 DIST knotifications-5.43.0.tar.xz 100596 BLAKE2B 6336ef154c418458ef93324978cc0bb7866ef638df872250387f765df0c57bef1b4ede8cefc7b81322318a9d0e03503dc98e3999852b3368f080902302b21396 SHA512 a90296cdcf557bba36185edda0da037e6a8bc069e5d2d7e3c4f7a692d0fcc8345fd28abed374ba25dd97c5e3f6834cd661d102629a1811b9e76285afac105c36
 DIST knotifications-5.44.0.tar.xz 100608 BLAKE2B 28792451e0f9487a9d0ca68030ee3412035075bb07b1575fd853e44e8af26deb1d21388902ca1d23c1be781ab78ccd6bca223410f59c8d7a3f0ca19441ac7453 SHA512 c7423b3796adad547f47c5f77e8854e46c125d8efa9ff573e3c1b3187caec2d2a760a0a0b37f8a53899b67b618683a13601985c0b25e6fcb017f88e5c5c3d1ff
diff --git a/kde-frameworks/knotifications/knotifications-5.40.0.ebuild b/kde-frameworks/knotifications/knotifications-5.40.0.ebuild
deleted file mode 100644
index 9cfffaf2c665..000000000000
--- a/kde-frameworks/knotifications/knotifications-5.40.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for notifying the user of an event"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="dbus nls speech X"
-
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
-	speech? ( $(add_qt_dep qtspeech) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/knotifications/knotifications-5.43.0.ebuild b/kde-frameworks/knotifications/knotifications-5.43.0.ebuild
index 0ec118ecd131..d6856719438d 100644
--- a/kde-frameworks/knotifications/knotifications-5.43.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for notifying the user of an event"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dbus nls speech X"
 
 RDEPEND="
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 405a417fe3d4..c6cdeb5647e3 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,3 +1,2 @@
-DIST knotifyconfig-5.40.0.tar.xz 83672 BLAKE2B c98e95d1d329139e94c707a8f058abd13bf28ea982302394757ef9caffc85eb0a2e16faa3cd85fe5d5b4f6c414c511a09b3a8a40a4e34a0e9f5fe67af4d1b6fa SHA512 0a368e63c5a4af2344293300e2acbf29ee3e07a101e318f883ffa97725b5f05d6bd563ed0f832b59d2052faa3f023be25235a473ad92b0b07456c65f2737536c
 DIST knotifyconfig-5.43.0.tar.xz 83604 BLAKE2B f91cf900a591c84f7256cac21680fe419290401696fe085debca225ae3a9e9adc2846745c92582ca7ac3bf655c93d01c0e297f307d40f91a0960d0131955f611 SHA512 2939609042d835eb5ea9c8abfbccd732854313e2882b4e0b966b633f43185ac8b4a0c9ab28a2bd4356b3f3a27fe12b1aee3b9a730280acdc952d0bc58bafa243
 DIST knotifyconfig-5.44.0.tar.xz 83612 BLAKE2B cd38dcf4eb6bd254d3dfdfdebfb356ce6ff29e2edaa208e02a4d3c932ac55b2ee8bde4094dfdc6fdd949de7b2139852e8e389f591a60b01aa3d29e1af20e78cf SHA512 a2e636e4f90f44ec81f508fb7456d7421bb3a2fe4964fb9859e3728b0255ed4318a65f22989dd9501e5b5e45019956da1bb31e66e5adebbcae1510f97fe24bef
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.40.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.40.0.ebuild
deleted file mode 100644
index de054174741a..000000000000
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.40.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for configuring desktop notifications"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="phonon"
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	phonon? ( media-libs/phonon[qt5(+)] )
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.43.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.43.0.ebuild
index b8f9b7f9e844..bee7e3a7123c 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.43.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for configuring desktop notifications"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="phonon"
 
 RDEPEND="
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 71635d88c045..019d461fdbb7 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,3 +1,2 @@
-DIST kpackage-5.40.0.tar.xz 125604 BLAKE2B f5d8f597eab542813810ff4b87a34f79f682b125e546fd524ea158b21e842d1f98c37f7a9a967de2139cdb8ea373f5c8accf3706554e82993caea0674cc04e67 SHA512 969250d2bfeabbb9e69d940156adde87d3819182bd71a36f4b02a7145023e39442b18785dc3ac58f44bd5dd865cc8dad88b731afb7def38f0c6e333553452870
 DIST kpackage-5.43.0.tar.xz 132080 BLAKE2B c98e3ebd35c28f18f76bb8a9e3f222eadb0372fd9eee64a2696962238ee76a9185830b72174eb71ce6b5a1c2d60a8ee2b29913068819736eceb05d003f0009c5 SHA512 bb40407ac358fe2cfb555bd50a653503763412b9ab131cc42873f0ed0fb93ac122f551269848e8926c37722091ab3c5be1bc868eaded92a708e42c34960a375d
 DIST kpackage-5.44.0.tar.xz 131956 BLAKE2B e89774459041b185942b0f3f6d106c65ece9e9b30df31be918e8149a1a4f0880e0c4121e4c6f2d2be19c6098ae398ad7cc2ee2ec41c28885c94e3d16026fc6c6 SHA512 955391fc597d7607bb16bc4fa60f3a0abe312db3b0dd13c2f6f6eaf45df7871c0a56aa63d5acfdd183ec43049c36424338311b0d1602405f815155dd2b36da61
diff --git a/kde-frameworks/kpackage/kpackage-5.40.0.ebuild b/kde-frameworks/kpackage/kpackage-5.40.0.ebuild
deleted file mode 100644
index 0c23e26308dc..000000000000
--- a/kde-frameworks/kpackage/kpackage-5.40.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework to install and load packages of non binary content"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="man"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kpackage/kpackage-5.43.0.ebuild b/kde-frameworks/kpackage/kpackage-5.43.0.ebuild
index bc804969ffe2..184b5fc85f20 100644
--- a/kde-frameworks/kpackage/kpackage-5.43.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework to install and load packages of non binary content"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="man"
 
 RDEPEND="
@@ -26,3 +26,9 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_test() {
+	#bug 650214
+	local myctestargs=( -E "(kdatecomboboxtest)" )
+	kde5_src_test
+}
diff --git a/kde-frameworks/kpackage/kpackage-5.44.0.ebuild b/kde-frameworks/kpackage/kpackage-5.44.0.ebuild
index bc804969ffe2..8af3a802d39e 100644
--- a/kde-frameworks/kpackage/kpackage-5.44.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.44.0.ebuild
@@ -26,3 +26,9 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_test() {
+	#bug 650214
+	local myctestargs=( -E "(kdatecomboboxtest)" )
+	kde5_src_test
+}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 860dd75a8295..d0d5869ca473 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,3 +1,2 @@
-DIST kparts-5.40.0.tar.xz 175920 BLAKE2B bdbc34f4a5dcafed935a4bbba89c7d7885d59db85cde1c90c6cc06d6293924365048190477b0a6e36d6be3627b053d1699e8dad42f3bb80029b1b7f1d7ed6d52 SHA512 0ab9883b5583f0d4aae1a27eeadd11b6d3d9902a5672487691275123eec81dcbfbea4f0eebf57eecc01d0a57df828f4b8729165fcc7c74d148acc5fd0a8ed87b
 DIST kparts-5.43.0.tar.xz 175908 BLAKE2B f450f6dbd0f82ef4a82c9d7238af63a0d5948b06c520e94c167e6e7b91697e73923e344d999689801deea0eebaea435359580ab8fcc9f522c63d1984ef6f9230 SHA512 1ce3acf007f402e675e1c943ee43beaaf9cc54017c9b67cf72eed3c4194ef7499e2e8f5fd93fb8569e33b07ed05d41385f50b9f7c5406ce412ffec977e461d3d
 DIST kparts-5.44.0.tar.xz 175728 BLAKE2B 46b8d027b9c4622893718570538c4efd42acbd778bede498d729194c0b7e32f7681813ee883bc05a631cbeee1a745b2e007a971f519db48fd591fed6e81cca49 SHA512 3fabedc454f7673999f63539c893eb5de3f34663db51d799786ea58e9b594e998ab496a7869c6ec74967be2737d90de38564a731971d61890edbee635775b33d
diff --git a/kde-frameworks/kparts/kparts-5.40.0.ebuild b/kde-frameworks/kparts/kparts-5.40.0.ebuild
deleted file mode 100644
index f58e68579e39..000000000000
--- a/kde-frameworks/kparts/kparts-5.40.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing elaborate user-interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ktextwidgets)
-"
diff --git a/kde-frameworks/kparts/kparts-5.43.0.ebuild b/kde-frameworks/kparts/kparts-5.43.0.ebuild
index ecd80b16ac31..a151df54de96 100644
--- a/kde-frameworks/kparts/kparts-5.43.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing elaborate user-interface components"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 4072a957127a..fc81f64e2a6a 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,3 +1,2 @@
-DIST kpeople-5.40.0.tar.xz 59692 BLAKE2B 70d8657c55fac82817d57415841dac99b22c3a58050feee2d061a201e8833c1b2eb247d26ee77ebcb080d401d29cc6e9405b80f43a7d8cd866ad069fd8b599ae SHA512 18b57e846bc614371c65c63662238b806c7dfd999be97695eeff1d1b4e4edb92ec3b7363e5876ec1bb9f9ff9335f6d7e8bd0140cf488f180fa660db20baab665
 DIST kpeople-5.43.0.tar.xz 59728 BLAKE2B 09a812f893d9d23d2b574d16de92b4ff9a363b16f61b1ec37b6964d14ec37dee24802a283dec4dad8ebc2fa6c133bf9c0ba266f79fe3ccad47e7639ccacc5bd0 SHA512 4eceebcf4a155713ee8b40027552c45d7cbcb8ce155394cb5aa57df28f7064486219f766cedc33a0de1e0969920d76b3252100688f546d71dba94064c1e2ff87
 DIST kpeople-5.44.0.tar.xz 59724 BLAKE2B d3b8550db797e4a3b70ccaddb29481bd0a4e369192927f6b64e724e7f591b10f5dd9b27332a5af54c6d5ddb5fd245758666afbfa7ad1c7d7d29422e98897f7c9 SHA512 aab91fe2e2f8f03d434b3e873cbc054c65f12db7dffdc2c03cf55cd7006f8771c08d56dbf0f009dc9444267a6f16fa3d46019f904b825bbc576bcd32896e82f3
diff --git a/kde-frameworks/kpeople/kpeople-5.40.0.ebuild b/kde-frameworks/kpeople/kpeople-5.40.0.ebuild
deleted file mode 100644
index f4d2a5520560..000000000000
--- a/kde-frameworks/kpeople/kpeople-5.40.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://cgit.kde.org/kpeople.git"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!net-libs/kpeople:5
-"
-
-src_test() {
-	# bug: 612504
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kpeople/kpeople-5.43.0.ebuild b/kde-frameworks/kpeople/kpeople-5.43.0.ebuild
index 9752db2519a4..bbde41c3b404 100644
--- a/kde-frameworks/kpeople/kpeople-5.43.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.43.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE contact person abstraction library"
 HOMEPAGE="https://cgit.kde.org/kpeople.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index d8a383c88d97..54793410b331 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,3 +1,2 @@
-DIST kplotting-5.40.0.tar.xz 29728 BLAKE2B faf2b25dfe0efcfa2b9069e7f856d00f4c9cb4774bca3294d9435edd4786f4f6d731f59d9229cb002dd6c4b2d06e6c0c58fd8a960376aef39e917e3711fd621d SHA512 71a9ec3d041c3cc05f221230cb8727873eb354d8b6c55b12aeaf1f8b41de492d37a66d47baf860b1b222265211351245dc47ff5d08f2c5839cbcf24b5fb53b40
 DIST kplotting-5.43.0.tar.xz 29596 BLAKE2B de084fa797227b70032978484c8cfa8d71d750cecc0ecd26277b760d22ee3bc2d77a0ebf93f75d6d854764fa58b76b497053c5e5d2e6268c96061ff2c4836479 SHA512 98b06b2f5242e03b4e67bcbb28d3abb695e4fc21ac37de47384fb872045fd64016ebfc276b0bd48e797e5369a747c2da81fd03519e1b6747e48205c53e69c7cb
 DIST kplotting-5.44.0.tar.xz 29592 BLAKE2B e732ab40f0db8527428c1a828d21ac40a9027ecc2572a3240f024b02f5b15a0be51d7ea16b6160cce4978302f49a26245ebfd50bd8eef91ca0db5c920e44f1b2 SHA512 effe44351097ba8f50959186986b4fbc434d5383f5d55bb9c7c0b52af4cbfc6f419b2442f304e920edffd833894a57ff35772ee3eb660eff8b8f9b69cb216350
diff --git a/kde-frameworks/kplotting/kplotting-5.40.0.ebuild b/kde-frameworks/kplotting/kplotting-5.40.0.ebuild
deleted file mode 100644
index f2db2ec5ab54..000000000000
--- a/kde-frameworks/kplotting/kplotting-5.40.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing easy data-plotting functions"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kplotting/kplotting-5.43.0.ebuild b/kde-frameworks/kplotting/kplotting-5.43.0.ebuild
index af9c36c9cecf..974f648029c7 100644
--- a/kde-frameworks/kplotting/kplotting-5.43.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing easy data-plotting functions"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index f791d8bd6c90..3888e6b51c3f 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,3 +1,2 @@
-DIST kpty-5.40.0.tar.xz 58348 BLAKE2B b943ffc92707ad6b1e54dad4f8ab2eb248b78a42bf210c9b41338bb16323d14c0624f7c1d87e5d93814ba6ef524bc6167eb8d44a6b661bf5bae56524a1179575 SHA512 85092a0ef665f7bcb22573c8cb678a4bd0f62a22e02f321caaf3857998396c1fbaeb135a7a40abe519e5421a14932e348223c2a7956befdf7b06cea378f8cea2
 DIST kpty-5.43.0.tar.xz 58232 BLAKE2B 83062be1f33dfb3d1c18bed7372ac259cd06fc3ac5d35d4f7ec29922cb1faff556d0301b9c8ba58a6984f0800dbebb516806cd4fd5d103d238f551a2eb2dbcc7 SHA512 8a09b2c5b864e5c70d181eee387ce1890cdd3b2efd1641a982061a102a677699b4a4376ee9a02e16cd3ddd29185e446b257c54131d8259aa9e2303856907a016
 DIST kpty-5.44.0.tar.xz 58228 BLAKE2B 4236534dba0cb86e25fa07722651aa8b24ee31b43aa69586a50309e3bfd987fc5b18312c9cd06085c9251f2fe7205efdbc03cfced671d2e8b42e9b6c65a9ae83 SHA512 b5fdfb7051a44db18652244846a4db706c60818b171724a87630e191b17a0313bfca7556608a150aa6d36476279a31533b442fb9e33e5b3f6be3681e1af6f103
diff --git a/kde-frameworks/kpty/kpty-5.40.0.ebuild b/kde-frameworks/kpty/kpty-5.40.0.ebuild
deleted file mode 100644
index 9a035c2b37ca..000000000000
--- a/kde-frameworks/kpty/kpty-5.40.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for pseudo terminal devices and running child processes"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	sys-libs/libutempter
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kpty/kpty-5.43.0.ebuild b/kde-frameworks/kpty/kpty-5.43.0.ebuild
index 052e41e44cf6..ccd14fd788d3 100644
--- a/kde-frameworks/kpty/kpty-5.43.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for pseudo terminal devices and running child processes"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 4bd28e0f8b59..8321a683b26b 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,3 +1,2 @@
-DIST kross-5.40.0.tar.xz 127968 BLAKE2B 0d6bae7a418fb441ca51c131095b9ff4f549395d3169050403f8275ae4b04b40fe04f6db7bfc5879260fb59fe9600039ca8db80030623142cc96d7bf062e9d57 SHA512 03051b30d84b9353e8397e39fec221f5e09899ff2fecadb347511d598099e374202c1c7b5553e323744237c4ed7c632f69ad708c5f6ce18ae9d57ac09fd8d88a
 DIST kross-5.43.0.tar.xz 127824 BLAKE2B 1775ad08a083c22256821b6adbff79219e98ac5b6289c5d292ed7870f94122717ac1cfcb86d6ec4c94e7d8289a398b17d5e39d86c53818afa6290ff76d6af627 SHA512 9ccde9efbb51fb8f90ab7ca5a824850ce3e37b2af1c972ffd2c079f9911a6752ffa1c98df11c6b35372e26fe014cd5966b44143a541972989e0668ec15299952
 DIST kross-5.44.0.tar.xz 127868 BLAKE2B 2a66810eb7723a32159ed1ba8b36a470d8710d054b12a025fa3734f5b4006ab27f17618507ceb0a5900a094f901c4c19c7e3ed10e754056399f5136663dbc5ff SHA512 186b85ee922265ab5f4a823289ea21ce2059576577ecffcb483b82d1c3f33da70e6906f71dcc0067e243002c6b711e697a906847837b59c3ed930581e90b6a9e
diff --git a/kde-frameworks/kross/kross-5.40.0.ebuild b/kde-frameworks/kross/kross-5.40.0.ebuild
deleted file mode 100644
index 2c012cee2caa..000000000000
--- a/kde-frameworks/kross/kross-5.40.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for embedding scripting into applications"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_qt_dep designer)
-"
diff --git a/kde-frameworks/kross/kross-5.43.0.ebuild b/kde-frameworks/kross/kross-5.43.0.ebuild
index 7b2f82f7f14e..ced1aaa5d329 100644
--- a/kde-frameworks/kross/kross-5.43.0.ebuild
+++ b/kde-frameworks/kross/kross-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework for embedding scripting into applications"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index f7fe3317513f..59767e0324f7 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,3 +1,2 @@
-DIST krunner-5.40.0.tar.xz 60644 BLAKE2B 3e03cc566dd2326487c9626b4098e241905eb84df4a2d1591ae55d32a51a78233c01fbf8ef4b223f2248b9c2f80b9976a91ddfea6d9eb3378a3a869a728fcae9 SHA512 fc634c01935096500614525f33c60497946b43d82f2656ab601ca49147c3d615288fa25645daf83c9fd6e734178b0abcd6c73f238ad8c5866ad1a47e83e60bb8
 DIST krunner-5.43.0.tar.xz 60016 BLAKE2B d73fe10b6353dc77809b125bb0efe82e9feecd0fdb59dc32a7bdd5eb9a802d914266647918f1c7e66e02b7f584faf9b2a32a015b45e84c66b1edf247bec6837d SHA512 c6ec92e0dbb8eb2d583af1d763cea6df1231851367148a94d8eae6aa88c130798cb8f3f2fb65946c55a51253c91e25fee539d7720a1f7125f78d2d5aabf4b05c
 DIST krunner-5.44.0.tar.xz 60224 BLAKE2B 8580538dcb3f5829ad1cd8186109c437df73d56bed4a88f52a0bc9489ce3d3746e3cb6e0ef9790a41f691aebf0c83e5462b520a783bbbc34c3b1853b322fd564 SHA512 a2459066248c2e580eab41c5e31e2e9d3c917fc68deee22efc2f3af3b80ed63a6a21e500e062c925ec284d85405eca3241cbe2e6be4ee9c400c1d9e932d37e2a
diff --git a/kde-frameworks/krunner/krunner-5.40.0.ebuild b/kde-frameworks/krunner/krunner-5.40.0.ebuild
deleted file mode 100644
index d8e77fcce7ff..000000000000
--- a/kde-frameworks/krunner/krunner-5.40.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for providing different actions given a string query"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kapptemplate-15.12.3-r1:5
-"
-
-src_test() {
-	# requires virtual dbus #630672
-	local myctestargs=(
-		-E "(dbusrunnertest)"
-	)
-	kde5_src_test
-}
diff --git a/kde-frameworks/krunner/krunner-5.43.0.ebuild b/kde-frameworks/krunner/krunner-5.43.0.ebuild
index d15b1eb63faf..8bb97580a3fd 100644
--- a/kde-frameworks/krunner/krunner-5.43.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for providing different actions given a string query"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index ed7f1e95e1ab..c6c9774342eb 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,3 +1,2 @@
-DIST kservice-5.40.0.tar.xz 250072 BLAKE2B 9f7e55d0a21f13b1b1eb651b10b8d7800fe93521760a23d40326227541a9b1b29b92783bbfa4159e84cf7db8ac3353ef55f963bdc7e43b365efd77e230486f7b SHA512 362a81aedb24f0fb2c598329e8b4fb174435b756f9a13617935d96eed1e5d40be38a8f27c7aedb0bd0cf07e73b5e1d464d53266e34b426958876aff2540fe89c
 DIST kservice-5.43.0.tar.xz 249920 BLAKE2B 81cdbb26ae2f58cc1b4767ea7f62b63f525a9c2887b5426d8ec63d2eaf675516199c9a315a9b9fff5b760de8d41c6f8796ff5ebc91bcba40cf680fd12b4c6f6b SHA512 bb912b7bfdd1473bd1b324dfd4ce93c7b9de69f2036aa7fc849735a797e76617b2d736a8e464d38e4b09fd3f9191336e323325c365c99e987be3df60268651c0
 DIST kservice-5.44.0.tar.xz 249880 BLAKE2B 883400a0d106e3c86041f398cf6e7c1280e72948484c3871f091b50306e36dfdd31a7011438260fc940923d9d3dee564f08df5c8649766c52536e6a727b8a394 SHA512 061dc701984e32339c2b285e6a76fde6e9353ae7e52ac58e8765c5645a3cef7268459f56731a4a75698981a9265fcc8fbb642b183499f752188ccfb490eb18e4
diff --git a/kde-frameworks/kservice/kservice-5.40.0.ebuild b/kde-frameworks/kservice/kservice-5.40.0.ebuild
deleted file mode 100644
index b7fab34227a2..000000000000
--- a/kde-frameworks/kservice/kservice-5.40.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Advanced plugin and service introspection"
-LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+man"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	man? ( $(add_frameworks_dep kdoctools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# bug 596316
-	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
-}
diff --git a/kde-frameworks/kservice/kservice-5.43.0.ebuild b/kde-frameworks/kservice/kservice-5.43.0.ebuild
index ed1da52d31c6..918230e0ce2f 100644
--- a/kde-frameworks/kservice/kservice-5.43.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Advanced plugin and service introspection"
 LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+man"
 
 RDEPEND="
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index b679b2203e5c..204bfce04cb9 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,3 +1,2 @@
-DIST ktexteditor-5.40.0.tar.xz 2296760 BLAKE2B ab4e458144dd0d7ba7460d9a0b9e3fbfa3c554a180c070976fef5372f447ad595e2c1ca9ac1dcabd19567c408efd46693b47894a9fbf8e6dc1ec681eb2f9d9fa SHA512 933b1a65e3d4bcc5347f35b7ed5d67c07a4060dd8fb755275e2aeeb40b3107b09b361faf7d95fb33991a9c36ed49f4c5e08ea9887b98a6096dd8ae0dbf48b208
 DIST ktexteditor-5.43.0.tar.xz 2302580 BLAKE2B 458e60148b02f59dd2da11a865bb11386b38a483493b3e7cd95b2f9edef4d8b90c03e453a37411f64e70ea66a81f486bba934111ae9e8d1361c1b38e6e7ed69b SHA512 fc2b3b69224e62d1bf240410fa5c3dab04e020f210230474e5e924c7125f626cd2dd30dee449948cb9197adc8f0d6e1886ed85e03312a51d116d86fc13fbf08d
 DIST ktexteditor-5.44.0.tar.xz 2301388 BLAKE2B fc80a35dbed030113644e4fdb4979cbfe47507f1d4fa9aed46a7c4d2f41c5d41cf9e8b98a18fe6f0621ce9e844bd52e7ddd826b4bfa4eebc45fa81256acac579 SHA512 ed89610d096f4cf4142ce6cf0267624d5c893ce577379bc2d69648f2128c2adb9eb72f14e7e92c47521afb215845d7fd0706242182a8a44da161a598c3c0c954
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.40.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.40.0.ebuild
deleted file mode 100644
index 315924049889..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.40.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a full text editor component"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="editorconfig git"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editorconfig? ( app-text/editorconfig-core-c )
-	git? ( dev-libs/libgit2:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	test? ( $(add_frameworks_dep kservice) )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package editorconfig EditorConfig)
-		$(cmake-utils_use_find_package git LibGit2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.43.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.43.0.ebuild
index 7683d63307d2..1d6bec2e10cb 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.43.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing a full text editor component"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="editorconfig git"
 
 RDEPEND="
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index d4b29da787e6..426f9aa4348c 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,3 +1,2 @@
-DIST ktextwidgets-5.40.0.tar.xz 308804 BLAKE2B e50c441fe7765a07b0241d98f2ec31f4a45a8dd1445c7b836b5df6458592374e3ececd6557b4a97b2bebf76e396516e893b7d7931c245b5c7970dda4bee2d3e2 SHA512 b24af586ff3832432d89106ce45d5b549958998a6be230f5ecce06e47a1ac55aa61c30f1d0a1f3ac1e51cb17bf4fea18990a9f33ed8ebb8f988d49bbc55023f3
 DIST ktextwidgets-5.43.0.tar.xz 308768 BLAKE2B c4e4831cfdab088b27adc9c65b91aff13cae3282c3999ca8004913caa7a46d89e1c1c0b1a04033b5919c339f909fe65cea57cdb582c45639b0e4b632e8d6dd8c SHA512 650272ba85a1d0177296fd278fa4183ecc6c513b00838745b5e1fefe015b621f1edfad25094ede3de8cf81dec4f66653b3c25ed2bb5a55e4a2ee54b2ef35da6a
 DIST ktextwidgets-5.44.0.tar.xz 308616 BLAKE2B 889031b1261412cf9eec48e18681551736aaa54d5891e5e4cda97a4fd4da15869b987825306623afe6ad087493cf949ccee957da030e18b37eb3428b0c128d78 SHA512 4570ee15270bc3548b90be6d69e29da114acc5c73031f2ec14130e6dd4d1c45f9010015d379dfdf5196d65f78a461f73c8143b30b812e886efe0eac9e5055946
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.40.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.40.0.ebuild
deleted file mode 100644
index e25bc2ffff7c..000000000000
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.40.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="speech"
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	speech? ( $(add_qt_dep qtspeech) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.43.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.43.0.ebuild
index 2bbfa4f065eb..62f252324fbd 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.43.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="speech"
 
 RDEPEND="
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 875b0def92f6..905129a31402 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,3 +1,2 @@
-DIST kunitconversion-5.40.0.tar.xz 772184 BLAKE2B 19e677d07aa5550636e8882d22371c06d67d5032b8ad12490aca0b5004b074834253da0525fbb04f1f31dd69a504f291d1ee26c0cbd761802cdf9400182a936a SHA512 a863956bf359b694cf3f2ffe7de2e79abfe379b6ed4c68ed73550da96c5d98f3ec562e7f790e97731abfb5b290dd874a459e91d38edd8918073d10c5b16c896d
 DIST kunitconversion-5.43.0.tar.xz 770752 BLAKE2B 3e4d30e18206468e3c010d49dc0a266a78a5d1aa22020aa6e97ebe60e72c009c47a2f1ba91e290e75b352e142eb3214ef23991e1cc8682d83352c63bd4d25f0f SHA512 bcde5bd5208fc5762c90e6b3c152bf4abb264d776dc3256ec246b1d0b9079d10ffcb1679a87ed4c0e39a1caaf092e5b4c3a1a8790adc1faeee148c8707e4aafc
 DIST kunitconversion-5.44.0.tar.xz 771156 BLAKE2B e53d43db81820c03165bc7e4b3a681ede105317b7884ab370a7a40530806863fa137464d876c333b2ff262e55b10e8ae544770aff7d7cabc442b1fdff1e2b44d SHA512 aa05ffbf8e587feb132376140a36bd3a5cefa08ec02893c5d44240f5fa78220c6ca2034ca00631054c3141d8bcb4563d2927c76adf19fec1687cdd2784cbec50
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.40.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.40.0.ebuild
deleted file mode 100644
index 44de7ca00c61..000000000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.40.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for converting units"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	# bug 623938 - needs internet connection
-	local myctestargs=(
-		-E "(convertertest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.43.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.43.0.ebuild
index 8f880d3d8fcd..5ee4c157561c 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.43.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for converting units"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 55fd446e80b8..96eac4d95d03 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,3 +1,2 @@
-DIST kwallet-5.40.0.tar.xz 306244 BLAKE2B 84fbefe01377d3c960274c9750fb7eecf3c0f45143004a35a9b331f197b84a807fb37655ad9793d0f4c8e29781ab30d0c09977ea24acd196a4eeeddd07254e58 SHA512 a162d5ed1901fe3c8675f715ddb9a32640d7b563bf0755a7add885208a8f55465d9082d2abb9553d411018d3a5a4856b17efc94789dbd5993ac6f11a8a0c71c8
 DIST kwallet-5.43.0.tar.xz 306848 BLAKE2B fbeac0ae4df91dde98840c3c88da30d43ce7ffa0fb4f18a5d51f0d15921d613804b235b0aba81c113ade1faba979ce105eaba956fcb9958a092925afc589d133 SHA512 38d129c45b1c2282c1e09a01fc9316b30b0d3f3c53f1b56dba295f732a2aaf5dab7759ca40b46ec80985d773a59a4ecddfc6edbe7fca7beb59c3392dab44e13b
 DIST kwallet-5.44.0.tar.xz 306804 BLAKE2B 4fd4da5ff2f8ac819840538e11db908da7d5aa3692ac225f88e3171deaff7c6819af53750c30392a6ada2bf5851b005b8dc17b3ace7af93afc2d0d8c7bf6b3cc SHA512 c7ca9438699fb9c33c5afd700b5273379e851384e525e75ac9044b9c829bb253651676bc67935442c4062da571a698f03586b842e097669b0b90f55531f2daf2
diff --git a/kde-frameworks/kwallet/kwallet-5.40.0.ebuild b/kde-frameworks/kwallet/kwallet-5.40.0.ebuild
deleted file mode 100644
index e46b676710fe..000000000000
--- a/kde-frameworks/kwallet/kwallet-5.40.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework providing desktop-wide storage for passwords"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gpg +man"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libgcrypt:0=
-	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gpg Gpgmepp)
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
-		elog
-		elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
-		elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
-		elog
-	fi
-	if has_version "kde-apps/kwalletd"; then
-		elog "Starting with 5.34.0-r1, ${PN} is able to serve applications"
-		elog "that still require old kwalletd4. After migration has finished,"
-		elog "kde-apps/kwalletd can be removed."
-	fi
-	elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
-}
diff --git a/kde-frameworks/kwallet/kwallet-5.43.0.ebuild b/kde-frameworks/kwallet/kwallet-5.43.0.ebuild
index 9ebbc724defc..4d88f86436e9 100644
--- a/kde-frameworks/kwallet/kwallet-5.43.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing desktop-wide storage for passwords"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gpg +man"
 
 RDEPEND="
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 534c6c62ddc7..688847021de5 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,3 +1,2 @@
-DIST kwayland-5.40.0.tar.xz 284976 BLAKE2B 756f461e431647fc80144eea85ba24fdbd9eced45c8d1802369c7e42d7e1590ae1481af98d2a3561ed7076299f7832a163ee048c9649d4b45cf2ac778c1fd2cb SHA512 3bbf49ee8a7cbf613d29fec59ac1444be1e89946792fc265a6c889fb32cb2ac93aca16ddd0e636daa8fda556ad01210e4bdd6b6ef4783ca95de5b0834baaa403
 DIST kwayland-5.43.0.tar.xz 297900 BLAKE2B 1684b506e01cccab46a9d19bbaeb7e98e2a4b3c5891b28c90c03150b3940a492f07540b284e4b2ec19fa76f23a43036bf123c3a4c0bf43a90561686e864e90e0 SHA512 02204faa2f125f9f902315cf2e7377a9ffdb73b1b66624510d1b77f32b9907c71d7e8ca7f79c8c10a2b9ab8e8eae13f8166ae3e33a34b2789c8f2e79aeb0f5a2
 DIST kwayland-5.44.0.tar.xz 298300 BLAKE2B fcba87fa584eef806cf9cf9ee8f1e70f68816e25bb156f2673bd63f762c96544987946603c19a5fa28e74c15a8675198a241f1572092aa2b5b19c8f89331c3c3 SHA512 df145f37ee00c9d0355f79864aa2b0df8ed23292615cba56b9b19856db29b30160bdd2da510c9a99fc91f59003892ed70ddc8a150cec2ed667bf9c678a49f06a
diff --git a/kde-frameworks/kwayland/kwayland-5.40.0.ebuild b/kde-frameworks/kwayland/kwayland-5.40.0.ebuild
deleted file mode 100644
index 710791b2d7e9..000000000000
--- a/kde-frameworks/kwayland/kwayland-5.40.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
-HOMEPAGE="https://cgit.kde.org/kwayland.git"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui 'egl')
-	>=dev-libs/wayland-1.7.0
-	media-libs/mesa[egl]
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtwayland 'egl(+)')
-"
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
diff --git a/kde-frameworks/kwayland/kwayland-5.43.0.ebuild b/kde-frameworks/kwayland/kwayland-5.43.0.ebuild
index 4bc9d6baa35e..96673a4f2300 100644
--- a/kde-frameworks/kwayland/kwayland-5.43.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.43.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
 HOMEPAGE="https://cgit.kde.org/kwayland.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 87ddb67aa65d..950f616d64a5 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,4 +1,2 @@
-DIST kwidgetsaddons-5.40.0.tar.xz 2179044 BLAKE2B ea6207fc550ef58a15cd2b00512f4ff30487b1acd3b337072de67342c26e4d640187c95995c86ef88c2f7843a3409dffb1811181d639c7fdac9c0fa0f57ebe3d SHA512 885afe981ff9aee90b9ed98e6d2d0a458729133ff9b681597a9836fc68c022906ce0e0dc53f58e60a907e23d5e5914993ce6a4610d931b62613ad15a0ac011b2
-DIST kwidgetsaddons-5.42.1.tar.xz 2178740 BLAKE2B b653efd24968fcf212cb8d35a3825e44533113e68092d04d9306f211cb037919e8063f19876a841531f2e78ffd6cd5d98256816048ca7512f88840035e29f7ec SHA512 4ab5549a6dd8c62ac896c9e589ceb3c6f26834f3a03558b565f3781a46d38f81c0f10edb049ae3dd8a358c9d8ce74d5743fb82007c8af9d2379b6ff7c1b80873
 DIST kwidgetsaddons-5.43.0.tar.xz 2180220 BLAKE2B cd82f14bc6d4970377857d0f66a5694473db33459be0337cba863bba206243bdcc1aa4c2c7a3b37df3aded7e88174215c01b5f8be82662cb56ef6d2b56aada2b SHA512 ae7664ab700cdb9aa35334005ae58d49db659cea4112fa81a09a37538809910841494bf97f3f982f99e27a376031645c5d0349e4cc77ab2c0fa6ea9484a08140
 DIST kwidgetsaddons-5.44.0.tar.xz 2181452 BLAKE2B 216ccdf2e37c31085d4f7b96e123597d842f8bbe7bc82222ea64c748342721f3681db5947cd8357f10d35d99fb93133aca53c10f688b3d32678e5198aae03f94 SHA512 61e869c1dc243d28334ce953f79d77e1e99649bee67d9c5abb21c17decd97cebed5c948a10cb8083a91e4c8fa90366073d521df59f2fd785c127a12990de4c3b
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.40.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.40.0.ebuild
deleted file mode 100644
index 896b97e67a87..000000000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.40.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.42.1.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.42.1.ebuild
deleted file mode 100644
index d59d575f3e78..000000000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.42.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.43.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.43.0.ebuild
index d59d575f3e78..b89ac0dbd7d9 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.43.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="An assortment of high-level widgets for common tasks"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
@@ -18,3 +18,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	nls? ( $(add_qt_dep linguist-tools) )
 "
+
+src_test() {
+	# bug 650216
+	local myctestargs=( -E "(kdatecomboboxtest)" )
+	kde5_src_test
+}
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.44.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.44.0.ebuild
index d59d575f3e78..7a1f9c81fc77 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.44.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.44.0.ebuild
@@ -18,3 +18,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	nls? ( $(add_qt_dep linguist-tools) )
 "
+
+src_test() {
+	# bug 650216
+	local myctestargs=( -E "(kdatecomboboxtest)" )
+	kde5_src_test
+}
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index c791baea14ba..391c00573560 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,3 +1,2 @@
-DIST kwindowsystem-5.40.0.tar.xz 169628 BLAKE2B 39a5c58a91781730436ebf911c7a31efc12881584c5bf2dd1695ac4e009612064ba617fa2f2834b9a501b7c9f82928c8fef2dca342371303a05e58b0dd54b417 SHA512 e07531098de25d96168efb2820b209b47cc5fd0ea5a9a38e3c7c86b079619427e1e597e7b07fd92ea1a64ad6f031afe037ccc73c64bc59e3e5143ab54fff530a
 DIST kwindowsystem-5.43.0.tar.xz 169592 BLAKE2B 24bad3c5b54fac52a9aa7cc5beb40214fba14759fd67478c2b38db600562b46f995ddceacacf41925f4df3f980cad9262de6057d50c173011fd9744acdf7881e SHA512 fa3df2f1a3eb1596ef429b8e84ce9696ffef3aa125727f0becf725b949611022887074a796116aadbb81adf6e5ff8e3b9fd49e72cf0066138c91ef09fdffd1c8
 DIST kwindowsystem-5.44.0.tar.xz 169644 BLAKE2B 88bf0fba2071e9f0b2c8be6afb2b71c9ab40b892db1abc72130e3372e300ea1682d2b7c94623ea0e0d5630c9d9a225c1d34cf71fadc6eca20e7f9ea503b41098 SHA512 cf66739a905eafaca39a53bfc1c4a533e21ac2732ad88b182decbad3a4b605b90d32d635beed1a124ca117b0d92d753500e91f2350df8f22b872112f89fd5808
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.40.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.40.0.ebuild
deleted file mode 100644
index f6d5e6b0bc5e..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.40.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing access to properties and features of the window manager"
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls X"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	X? ( x11-proto/xproto )
-"
-
-RESTRICT+=" test"
-
-DOCS=( "docs/README.kstartupinfo" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.43.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.43.0.ebuild
index 2615478ef608..ba95f335bb1b 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.43.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing access to properties and features of the window manager"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls X"
 
 RDEPEND="
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 21919f80ceb5..9477512a87e9 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,3 +1,2 @@
-DIST kxmlgui-5.40.0.tar.xz 883668 BLAKE2B be1406a557c48ea3779aa16aec94fc76d6838b7523995290deb41d14f5738fe2669ef3309125e32c0536053ce1ec913d294563fe357b8218b5ab3ffbeb5531c0 SHA512 fc29a88395a9fb1979fa56d6e98e789da2831745358b71c2845e8f180b42ad76f1880fc22d13fb3e830dadcd945dd3225c1aa3fd008b14eaf7201d6f05355177
 DIST kxmlgui-5.43.0.tar.xz 884284 BLAKE2B 01228a6aaae155bce38e44ee64110a2cb29e952c1ac9cf0107e1f09a7003b35487bb23000eeae17bbf0debe8b7b509b03733b4a0d595ff3bae58db9e013a28bc SHA512 ace47a5a01267ba33bc9173058a05cb49cfba7d18a171527df4afb094e437885b697fe5ab02d1609f6e577857f3f27d7d4ac2a25f6ea2dd659291d82fe25aa75
 DIST kxmlgui-5.44.0.tar.xz 884472 BLAKE2B 6001fb2a4553c9d452d9224941bc3d253791ae5f6730da5296c5fc09c445af0c91057fb2badb8e0bd36729de7256f0df075774b2c05f54783d757946a99252a5 SHA512 594e7c5222149c2a61b98455c8762dd6da59216abb7b992dae31d02d12bf2e61847686ab9a6cb6a6b206ad6bd7ffbf6d47a40e5c6e98eb1c3eec4a12cb655170
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.40.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.40.0.ebuild
deleted file mode 100644
index 9971ad6eed7d..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.40.0.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-LICENSE="LGPL-2+"
-IUSE="attica"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	attica? ( $(add_frameworks_dep attica) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package attica KF5Attica)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.43.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.43.0.ebuild
index 1962dcc0d82d..6ceeb629f579 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.43.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.43.0.ebuild
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 LICENSE="LGPL-2+"
 IUSE="attica"
 
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 95482a82dcd4..614df524e4c3 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,3 +1,2 @@
-DIST kxmlrpcclient-5.40.0.tar.xz 29296 BLAKE2B 4ca339d8fe3130c53fac366754322fdda2acb155b0a77ce6677756a5fd2f89e895f829b92242bc5c51a6d6885c8f38cb0153c051f11a1b55522485ae333db532 SHA512 e35410b53dc39940b5487bae385167d86f8b2cb82248953aca246cdb8bf21db65749f3179940156e302d43aac03756a2085217cf66716718dfd6765caafc7294
 DIST kxmlrpcclient-5.43.0.tar.xz 29320 BLAKE2B 8b96b30e7ced5293d7397935b93b6fb92b7455ddef3c463a1c5d3e48c65182479efbe285aabb62befa646db22d27c80bf201c9d9cf20296ce9681f1497436737 SHA512 82940cd57ab846009b3bb2f50ff8502679a24212df6d4c8f7499874070dbf43858564f29ea09b278d766ee4a13ce5b92b0d847e5ecb8aacb00194a31393bba3f
 DIST kxmlrpcclient-5.44.0.tar.xz 29420 BLAKE2B bda743b03702b1d9d3df8ca3d80380f30ca0186a675d71de63f5c42ad1055b0a999c72a1084d978ba5ada364db4298bdb93d0612692e1da26e8e571a0658072d SHA512 288ab20ec3465e82b52792e572c03b8d0eda0a1e1e275850065a113906a41f835ed7d33ced43d6069bfef9ef479ee91deaffa5fadfebbeb0d1eb6dd3c57968e5
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.40.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.40.0.ebuild
deleted file mode 100644
index 455796afe8a1..000000000000
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.40.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.43.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.43.0.ebuild
index d9a11e8ddd03..c9574c10aed2 100644
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.43.0.ebuild
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index ffd68c22fecf..379f23e40799 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,3 +1,2 @@
-DIST modemmanager-qt-5.40.0.tar.xz 98404 BLAKE2B bfb16ad423c67ae213c97a2c1e463591910e42b49e2c7d3199dfe77e5c5bcae11bae2e680d87cd18b8c73fe05a950ec093fce7d159355779cbdce03dc1e8cf79 SHA512 81d9cc2a851a5846c6aaab561776f7c4a04b8567f2db5e2c235f11b3261aa1164d3a442fc4401225b57acb1e9f75efc61bf4f8a04bec3948e7cb0854653d0758
 DIST modemmanager-qt-5.43.0.tar.xz 98252 BLAKE2B c91a1d1ed261dfe58e16c7628d2a5126de924f82676fd3ce042eacef877a90971b4b26b6106cc4aeb28d0e50fc67dfe59ec681609eff2b21e227dafaf7ad5a4a SHA512 c51e3368520ebbcbd1f5eaf40b4f8ac141eba135a4f5259538ffa5cc790c778d4c415daadeaeab8fff122bf9a04e845ba68acf80110777a63d8529d0e83eff8b
 DIST modemmanager-qt-5.44.0.tar.xz 98272 BLAKE2B 3af975eaa31e09c911d5c92b035177bb5ce89d629eaa96227d1a824335fde0c2741c2357f7dfc237bbae76a5eb4f3a3f1a470fa845b5b5629a1987b52af8e094 SHA512 a7d39cb2627a8166944d76f4055f968aa25a40cca1edede16018af76d1ea55e8bbf0ed051de6c6b3898b9ae3e3844d200bad1af20e62af1f13d39c26c0ab0b75
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.40.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.40.0.ebuild
deleted file mode 100644
index bfbc8fd9fc10..000000000000
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.40.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="ModemManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtxml)
-	net-misc/modemmanager
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires running environment
-RESTRICT+=" test"
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.43.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.43.0.ebuild
index 0c4e09a7567f..d20601696a93 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.43.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="ModemManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 203ab49ec36b..19cbf6af55ea 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,3 +1,2 @@
-DIST networkmanager-qt-5.40.0.tar.xz 163456 BLAKE2B c8d0e85f06219ba5d89817c86cd97c493146b5a184f363b5367c93d138d52cb2c4901536afd9950a0c9cb54b1cd4ee9356f614d4573ddc6158da5cff873f99c7 SHA512 6c04dd10c85573fa33d1651aa17afd1f987cade3ec299b1f73c3f6052aaf65aa393aca97e0a22f6434e325e99a9c72c7c6398946c1573be3df57c08905460bac
 DIST networkmanager-qt-5.43.0.tar.xz 163504 BLAKE2B 6c06f3ba40e8402795cbb25560153f3b2ca8252dcdefb5bda1af70f1032bc0d136fc1981ab3cd57f1bdf631ca448fec29dfefbc61a3674a87036144d1717ff9e SHA512 29c4102f3de6eabb18e9afc15f96032153a073bc189a7422b39d405549cc5b206a1519dda15341669b63bb487c60f377cb66a215cbd3345d40def485d0205de4
 DIST networkmanager-qt-5.44.0.tar.xz 163508 BLAKE2B 980e368512d325d5bf252a938840e3712620407d039b31fec68df25f12e452347b7f195297ca0ab331f366df6b14b3ecfaf39bae43b312d0a404e6c0856813ff SHA512 926ece0d7e869613bc78cb71c915ad8b1573b4111ab38377dee9c196ba31422a95311819c36aa4e14b42590fcc628141d5ee8d1e025f56c57da5e5b48f438725
diff --git a/kde-frameworks/networkmanager-qt/files/networkmanager-qt-add_EAP-PWD.patch b/kde-frameworks/networkmanager-qt/files/networkmanager-qt-add_EAP-PWD.patch
deleted file mode 100644
index adba0ed461cc..000000000000
--- a/kde-frameworks/networkmanager-qt/files/networkmanager-qt-add_EAP-PWD.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f185da94f628e4384607703928e26fcf2f34fa7a Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich@redhat.com>
-Date: Mon, 11 Dec 2017 14:24:14 +0100
-Subject: 802-11-x: support for PWD EAP method
-
----
- src/settings/security8021xsetting.cpp | 7 ++++++-
- src/settings/security8021xsetting.h   | 2 +-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/settings/security8021xsetting.cpp b/src/settings/security8021xsetting.cpp
-index 0fc9bde..38323b0 100644
---- a/src/settings/security8021xsetting.cpp
-+++ b/src/settings/security8021xsetting.cpp
-@@ -569,7 +569,8 @@ QStringList NetworkManager::Security8021xSetting::needSecrets(bool requestNew) c
-             !privateKeyPasswordFlags().testFlag(NotRequired)) {
-         secrets << QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD);
-     } else if ((eapMethods().contains(EapMethodTtls) || eapMethods().contains(EapMethodPeap) ||
--                eapMethods().contains(EapMethodLeap) || eapMethods().contains(EapMethodFast)) &&
-+                eapMethods().contains(EapMethodLeap) || eapMethods().contains(EapMethodFast) ||
-+                eapMethods().contains(EapMethodPwd)) &&
-                (password().isEmpty() || requestNew) && !passwordFlags().testFlag(NotRequired)) {
-         secrets << QLatin1String(NM_SETTING_802_1X_PASSWORD);
-         secrets << QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW);
-@@ -655,6 +656,8 @@ void NetworkManager::Security8021xSetting::fromMap(const QVariantMap &setting)
-                 eapMethods << EapMethodSim;
-             } else if (method == "fast") {
-                 eapMethods << EapMethodFast;
-+            } else if (method == "pwd") {
-+                eapMethods << EapMethodPwd;
-             }
-         }
- 
-@@ -862,6 +865,8 @@ QVariantMap NetworkManager::Security8021xSetting::toMap() const
-                 methods << "sim";
-             } else if (method == EapMethodFast) {
-                 methods << "fast";
-+            } else if (method == EapMethodPwd) {
-+                methods << "pwd";
-             }
-         }
- 
-diff --git a/src/settings/security8021xsetting.h b/src/settings/security8021xsetting.h
-index 8b1f5a3..5289771 100644
---- a/src/settings/security8021xsetting.h
-+++ b/src/settings/security8021xsetting.h
-@@ -37,7 +37,7 @@ class NETWORKMANAGERQT_EXPORT Security8021xSetting : public Setting
- public:
-     typedef QSharedPointer<Security8021xSetting> Ptr;
-     typedef QList<Ptr> List;
--    enum EapMethod {EapMethodUnknown = 0, EapMethodLeap, EapMethodMd5, EapMethodTls, EapMethodPeap, EapMethodTtls, EapMethodSim, EapMethodFast};
-+    enum EapMethod {EapMethodUnknown = 0, EapMethodLeap, EapMethodMd5, EapMethodTls, EapMethodPeap, EapMethodTtls, EapMethodSim, EapMethodFast, EapMethodPwd};
-     enum PeapVersion {PeapVersionUnknown = -1, PeapVersionZero, PeapVersionOne};
-     enum PeapLabel {PeapLabelUnknown = 0, PeapLabelForce};
-     enum FastProvisioning {FastProvisioningUnknown = -1, FastProvisioningDisabled, FastProvisioningAllowUnauthenticated, FastProvisioningAllowAuthenticated, FastProvisioningAllowBoth};
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.40.0-r1.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.40.0-r1.ebuild
deleted file mode 100644
index c0ec2aecc0f9..000000000000
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.40.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="NetworkManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="teamd"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtnetwork)
-	|| (
-		>=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=]
-		>=net-misc/networkmanager-1.4.0-r1[elogind,teamd=]
-		>=net-misc/networkmanager-1.4.0-r1[systemd,teamd=]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-libs/libnm-qt:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
-
-src_test() {
-	# bug: 625276
-	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.43.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.43.0.ebuild
index 4bcf5b7443f8..aeb639341a59 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.43.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="NetworkManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="teamd"
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 5c62d355ac58..9bb532af1ea4 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,3 +1,2 @@
-DIST oxygen-icons5-5.40.0.tar.xz 234407136 BLAKE2B 0f654925131cb958516c54ed577540c4880f0fa45c31741afe15cd717d37d07342f62a5db211d628d095b25d78e45df5a37af469d22d807defe09b04499d61d1 SHA512 c1bdfdbeb01440d56600b9b17b9247207d0cdd5bbd316cf0140788e76efdcb094fee98b4cc00f86951005e5a125407edc0902d0edfd369065d934cd8fb1c37f0
 DIST oxygen-icons5-5.43.0.tar.xz 234410612 BLAKE2B aa7c2d43a75c9581faffae424ff9d81e4f18b7e53649652aa080fc0295c1516100137609d984a27fb552d4596b360d01a0e7379268c47a30911c8d3532fe5ef0 SHA512 15b902dd91e4ea041b5305d3661b22d87eadac110230103f1ebe44b6357731f1140a275626d0adc0baac577b665d0d3bf58a4e18163f7e0e07c644699ba5e73d
 DIST oxygen-icons5-5.44.0.tar.xz 234785788 BLAKE2B 207e7cdc90687a86941dea88e521319218a7feac8f4f88f408171c9357405f3c5d8a525a3ee306aed354c48389ccd31a0e8ff534cac79e3bc6cc056b9696cbe4 SHA512 d8bd5e92dd4bae362bd8d5db399653834d7fae3356ef9ea56d84d12be46585574b5c4b40d069b3bc5032d9b682f2f2b89507df85096cc1fa97ba5ad217dd8e55
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.40.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.40.0.ebuild
deleted file mode 100644
index 636642bba630..000000000000
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.40.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KDE_TEST="true"
-KMNAME="oxygen-icons5"
-inherit kde5
-
-DESCRIPTION="Oxygen SVG icon theme"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	test? (
-		$(add_qt_dep qttest)
-		app-misc/fdupes
-	)
-"
-RDEPEND="
-	!kde-apps/kdepim-icons:4
-	!kde-frameworks/oxygen-icons:4
-"
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.43.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.43.0.ebuild
index 30f0353067e6..312a1528335d 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.43.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.43.0.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 
 DESCRIPTION="Oxygen SVG icon theme"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 3ec84197af51..7fbb0f27304c 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-framework-5.40.0.tar.xz 4607172 BLAKE2B 84c72797dc00ebae7a2daaecaa4f3bfdfadd53eaca84253f08e54edd3e735c09ab50d2a43f08302e33d504ce77f0d877858e3224c2a1b0ff2d8c046ff5805104 SHA512 0718ff2fa45d6e793aec947ea42c7264ec379014a6286606eb7bc2577a64f236621f67f20b5223794c1d9b65989a2ebaa6f77f2c11f48fafd0f992dc03e01189
 DIST plasma-framework-5.43.0.tar.xz 4614848 BLAKE2B 459a1cc128ee2e110871f690c485f6b7707f6830f8ffef4120b65d8da18263e6c2ffb3e159fb31beb1dd3cdc93436634c2804e6914cc9c761373df133e764084 SHA512 e86d8ba66edd21712bdaba0d2e86c3a2618b8925115022d3f614d5d0bcc7b9f9c1b33a4d09ca090555c508d316ba7341d85d3f515698982e014d1e5c3d1c7fcc
 DIST plasma-framework-5.44.0.tar.xz 4617176 BLAKE2B 2fb64b5d5635ff2af01bd07dc3e5585fb8c2bbe479a52ace2dfaca6910df538459d30f4d93a725b9abf1be759063945394e3b74ff258ea7b9ce4cfddb87b084b SHA512 0fbe53f7f83c8888e8148fd0534f816070aa895ec87de6df19454796485d446171df36e30814598eaae3d95e27e11cf7196ed916fad87be237750242e008185c
diff --git a/kde-frameworks/plasma/plasma-5.40.0.ebuild b/kde-frameworks/plasma/plasma-5.40.0.ebuild
deleted file mode 100644
index 30a2d7f9577b..000000000000
--- a/kde-frameworks/plasma/plasma-5.40.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="${PN}-framework"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma framework"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gles2 wayland X"
-
-# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.9.0
-RDEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative '' '' '5=')
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	!gles2? ( virtual/opengl )
-	wayland? (
-		$(add_frameworks_dep kwayland)
-		media-libs/mesa[egl]
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	X? ( x11-proto/xproto )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package !gles2 OpenGL)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.43.0.ebuild b/kde-frameworks/plasma/plasma-5.43.0.ebuild
index f8fa9d11bd33..b56cce548ebd 100644
--- a/kde-frameworks/plasma/plasma-5.43.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Plasma framework"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gles2 wayland X"
 
 # drop qtdeclarative subslot operator when QT_MINIMAL >= 5.9.0
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 1caf963c9cb6..91293a134b17 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,3 +1,2 @@
-DIST prison-5.40.0.tar.xz 13904 BLAKE2B d2fec20bcba0fec9f0426ecb8b42cb559b0869c158016f02864cfa774351f339705f96830f7f30f2d0f37c2628320ad490dc8cc0ecaa565da4fcc904da3123ca SHA512 a4cbc5c8200b280c802f1fe2314d464b68ada11a1e3ad45d4a851a324e691c6b24bace569118405c10cbc97e01cd7f233b19da31887e86b54d1b260d73fc0e48
 DIST prison-5.43.0.tar.xz 37500 BLAKE2B 37ddfd6a79ab8d20997db5a6c894664f9c9e9247dc412bc2377e0a73b01d83d2139594bb26b56bea9c192b02d9bb640832d98bf769d72049b29f0fe2335c793c SHA512 6cb086396557a7bddb4ae7bc75e8503f5f037138b6c486abf10eec681e9440a642e5fe21178005092ae537a2e7272ada33aeb17ff70a65849a7476810bae15b6
 DIST prison-5.44.0.tar.xz 39332 BLAKE2B f44a234aa8ad66ac3618c6b723eac8a4fdbfcb12b63472fc4b880e32c2ff27270d90c0b29b1ed97627ab9e9100b47a24c387ae8531899edca0d27cde6f397e6d SHA512 338c831b26dff620655b5d5a4c626f68f4ac3f172a0153116f6b1df536fed15a46c6ee422e952cf50b21298211aa89657efdac449e0311f1581307f417f5d601
diff --git a/kde-frameworks/prison/prison-5.40.0.ebuild b/kde-frameworks/prison/prison-5.40.0.ebuild
deleted file mode 100644
index 7d9862c46263..000000000000
--- a/kde-frameworks/prison/prison-5.40.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="QRCode and data matrix barcode library"
-HOMEPAGE="https://cgit.kde.org/prison.git"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	media-gfx/qrencode:=
-	media-libs/libdmtx
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/prison/prison-5.43.0.ebuild b/kde-frameworks/prison/prison-5.43.0.ebuild
index 58d93e06213a..d9864d8c6f81 100644
--- a/kde-frameworks/prison/prison-5.43.0.ebuild
+++ b/kde-frameworks/prison/prison-5.43.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="QRCode and data matrix barcode library"
 HOMEPAGE="https://cgit.kde.org/prison.git"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 43cef04b209b..91cb0aa11721 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,3 +1,2 @@
-DIST purpose-1.2.1.tar.xz 114408 BLAKE2B 99d5eff18fd66b0823c36381281229705c54d4266926ce02cdcff4899c2431b8c3aa97667dab19824676b72c456cea2bf56a032d6137f2c9c207d724196fb262 SHA512 39747f5043e09f198bbec25d011a45c54cb681fd564ade25016f1b898a3fa4d545f29dc96ca421c266414d375d6b95259f59292255dfb73af777ff62a96ba249
 DIST purpose-5.43.0.tar.xz 117084 BLAKE2B d68e6153524cac9ab6e221433d5781e0d4060b734cef27786cdafa9dd96a0eda410b1bc7371dc49db7846be48474cedd1dbc2b224811514913d0adf0eec8c79c SHA512 5cd1b90b120111d1d8ba4d3103143679026bedc4de29acfe5d25a39464a1277450030d7ac505cc322385cf9d300c7009c99ce57a21acafb6ac07ab6186ec25a5
 DIST purpose-5.44.0.tar.xz 118432 BLAKE2B 424c7e680fbd8d69f986cc1ff4ed8b777f0991ab32c9b918230e3ffa833fc2b73dcf231f22f4a21a8f1c4b49f50f2c62016e7f985541f1fe484271cce832e50c SHA512 0a8f6101d1771b1271bdc29dbdf5172eaeb79fa9fc74676665f44a52ca92674231569598505c5b64cf8b4ca42567e821e1946992d0d7c3c5d160948da8f043e3
diff --git a/kde-frameworks/purpose/purpose-1.2.1.ebuild b/kde-frameworks/purpose/purpose-1.2.1.ebuild
deleted file mode 100644
index 06e55ebd995a..000000000000
--- a/kde-frameworks/purpose/purpose-1.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_QTHELP="false"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+kaccounts"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons '' 5.40.0)
-	$(add_frameworks_dep ki18n '' 5.40.0)
-	$(add_frameworks_dep kio '' 5.40.0)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	kaccounts? (
-		$(add_kdeapps_dep kaccounts-integration)
-		net-libs/accounts-qt
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep extra-cmake-modules '' 5.40.0)
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kf-env-4
-	|| ( $(add_frameworks_dep breeze-icons '' 5.40.0) kde-frameworks/oxygen-icons:* )
-"
-
-# requires running environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kaccounts KAccounts)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst(){
-	kde5_pkg_postinst
-
-	if ! has_version "kde-misc/kdeconnect[app]" ; then
-		elog
-		elog "Optional runtime dependency:"
-		elog "kde-misc/kdeconnect[app] (send through KDE Connect)"
-		elog
-	fi
-}
diff --git a/kde-frameworks/purpose/purpose-5.43.0.ebuild b/kde-frameworks/purpose/purpose-5.43.0.ebuild
index 66b1fe611737..8a91b4068652 100644
--- a/kde-frameworks/purpose/purpose-5.43.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.43.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+kaccounts"
 
 DEPEND="
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 2f3c5d8d7de0..0e728bb5a892 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,3 +1,2 @@
-DIST qqc2-desktop-style-5.40.0.tar.xz 35292 BLAKE2B 367c633eb67ac76dfa0a58bbe2cd021a9eacc4155913c35eef855417234424beb1cf674f5f3ae749518a113316f3f68e8636d7495b94a3f1bedef13637dae20c SHA512 ef6c94583bbd264b1057439cde0428a6f2d95e1001832215aafe14549d521e0647b99f5cd61b56becdfba14ffbc140a3cc3b88a6f98e0aef7f409f7f203b2b3c
 DIST qqc2-desktop-style-5.43.0.tar.xz 36916 BLAKE2B de086300fb86fbebafaa4f5d0065b9ce2e8d7bc9e6c68698d938b555a834857357ab9f949597a42f3a7c80236bfc5a396b881ac92210d578b3a2e0f63672b921 SHA512 f20f67745bfd58a78fbe943b0676326ddcd18f4d733d77d50c29ed5a0b4215e7500634225e14700f3b344a9b5952def756b90bd5844c7fa516fba28e7a27bb13
 DIST qqc2-desktop-style-5.44.0.tar.xz 38616 BLAKE2B 9a3cd6816e7b77c31425f094a5c58f09119a6b4416d1ec288d67f439e870afbf8298a90f965f0dacf0acd711bf20cbc2609ceff092401ea58f58f1774a8fea6a SHA512 673a49e38ad90ca8aeb9a5e0454a4abb172b94bcb606db2d5ecc041c5cd97b8899ab0ac06568e7a5a3a668807910beed6f2d5ec482e9fed87db343e995f898ac
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.40.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.40.0.ebuild
deleted file mode 100644
index ed8019255a17..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.40.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-KEYWORDS="amd64 ~arm x86"
-LICENSE="|| ( GPL-2+ LGPL-3+ )"
-IUSE=""
-
-# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.8.0
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtdeclarative '' '' '5=')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtquickcontrols2)
-"
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.43.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.43.0.ebuild
index e4c5e5dc30eb..8db74ce4a5a3 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.43.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.43.0.ebuild
@@ -7,7 +7,7 @@ KDE_QTHELP="false"
 inherit kde5
 
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
 IUSE=""
 
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 46d8662d5e18..321ad57f50fb 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,3 +1,2 @@
-DIST solid-5.40.0.tar.xz 247840 BLAKE2B 0aaf2e81d152c3e616123e0959e356170aaa974d6431e33ec6fd935e3750311f444c57adb1f45772d1454db50b82a601df5929e2201c09960ecc4977b636f0db SHA512 83a63f08569b385ef21e3401aabe61c04cc7a727e0788b126a9c23f659fb24186f8810223b8b64da605033f46775b5b3ce6e8b2f1b2886b2b533afbcf2691bb9
 DIST solid-5.43.0.tar.xz 249208 BLAKE2B 26db66973201b164b227e25763f619a4988edfd230673eb5d322eab438b1e6e40261b5a9dac7f921de27490c93e874efdf29c843bd82dbeca030693cad579e4d SHA512 6a7dc7d75a0340e69900758be5aecc201bf8c1e5a28b549e4f50107ae9ff800701b0abb88cf0c917347723e62d3222f4e066e399c916c537f3560ac7b9d20f1d
 DIST solid-5.44.0.tar.xz 256972 BLAKE2B 5734396d82fd3558ab665261073d5087e48035b7a31d534153e02a6a6df0968f7d2fd4fdefd6357c496356dc8479be9623ba517ae07b590c0553a271829a8409 SHA512 5e60699251be9703c33332fb5a445cea5e8e18d6b9adce093e1a3cdc89c6084696ce8fb9745458a6aa6f1bff8a499fba2a76fd641fe2b24541cb3371d2bd5f91
diff --git a/kde-frameworks/solid/solid-5.40.0.ebuild b/kde-frameworks/solid/solid-5.40.0.ebuild
deleted file mode 100644
index c0a59db5f791..000000000000
--- a/kde-frameworks/solid/solid-5.40.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-fs/udisks:2
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "app-misc/media-player-info" ; then
-		einfo "For media player support, install app-misc/media-player-info"
-	fi
-}
diff --git a/kde-frameworks/solid/solid-5.43.0.ebuild b/kde-frameworks/solid/solid-5.43.0.ebuild
index 5ba7d7e87013..cb3684fcf999 100644
--- a/kde-frameworks/solid/solid-5.43.0.ebuild
+++ b/kde-frameworks/solid/solid-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index bb2b8ea9248a..4f1606e61340 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,3 +1,2 @@
-DIST sonnet-5.40.0.tar.xz 284824 BLAKE2B fdecd27ab93d346884cfb0ec6c21cc15451a8f5f8060b8037cdc7197ddbdfe31ce74774dd1875e17496cc1f24dff7e74f11095d098db7b18ada420b6da2f2023 SHA512 bf304b06607a1c98467621018445638e6e7fe96198c296452b853d5f593da406b247bc812616b354d114d83a5156df7794fa041e0a41ebd6f3d9e322a7a47d0e
 DIST sonnet-5.43.0.tar.xz 286196 BLAKE2B e5f18c9468f612a30098faed7f84e447a8de88c98e905805115a24b2aab2d7546d561723842d734d4be3763ac42fd43f99b1be11860cc68cc004578073eaffcf SHA512 63ee853d5f2df8b8163253add74418e46810188d58fc4ea56ee1d6dc6cd2f25b89c40f21039840c1992b2ce84e44acce26373cedb70770ca3d806e1dc73a0aa0
 DIST sonnet-5.44.0.tar.xz 285492 BLAKE2B 7cd2558c71017a16f40712532b8f3ffdd082bdbbebd68481d40a6055c4f2d36990afad0e4611dacbc36b6568762447d50fa5c2706c7c20f1d33dd90757a1fece SHA512 a3909673c0949f19d16a2a4b9036f1fd572d5d88990bf1147cb63484a08ae2ca70c479ac5c196b32e8f1b19359ffbabf2394b507dce93a1fc86bb3ae43a73e60
diff --git a/kde-frameworks/sonnet/sonnet-5.40.0.ebuild b/kde-frameworks/sonnet/sonnet-5.40.0.ebuild
deleted file mode 100644
index 445dcc8cb66c..000000000000
--- a/kde-frameworks/sonnet/sonnet-5.40.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="aspell +hunspell nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell:= )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package aspell ASPELL)
-		$(cmake-utils_use_find_package hunspell HUNSPELL)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/sonnet/sonnet-5.43.0.ebuild b/kde-frameworks/sonnet/sonnet-5.43.0.ebuild
index c71996ffd9f6..c2d11637d765 100644
--- a/kde-frameworks/sonnet/sonnet-5.43.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="aspell +hunspell nls"
 
 RDEPEND="
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 9860f39c82c6..4cb513e3f3ac 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,3 +1,2 @@
-DIST syntax-highlighting-5.40.0.tar.xz 1108400 BLAKE2B 44fd2a5374dd2a28db211fa1d258fe612cd6fe6c72422cd1fbe942d56684a9c4286a947038e105e8e90d1a701bb5df376a3f18aa73e836773690f695a6325152 SHA512 4e7868ae64e18b7734d7d5b778187951ae01fdd2d2dfaa1a78f8d9c0b9d5c435e30f4bc333dac3ed18f864f3458991144e870bd6a2c5b17c8ee49b61a82c0ccb
 DIST syntax-highlighting-5.43.0.tar.xz 1108032 BLAKE2B 7ee4f4aa63bbd374e750eee8ad35a3e9d2f840fb3e176d2f055c5c89c78ffc585fcc908d046946862c1f5ee3957e121183649f1ba811ba3f49b3688941518099 SHA512 3d9f2e073e05690922126b4b5360ef178655482158ff3471b469826681b86cba1ce1e555f0bc15df27dd980632a8324ad666bad178ee98eaf5fcdf58e2618c83
 DIST syntax-highlighting-5.44.0.tar.xz 1125324 BLAKE2B 7ac9a94c6f4986be303bf0ee651585e6a3b484c52f2e44f7a6d2642a3e847de691844df8bd2cadda15f27186c0ca0b0c211bb0072ab1ad637608355b3aa7d7f1 SHA512 6d503648c7572ec049a2e534318cc1bc5f0d83a1460e92f5c0fb46f29a6891ea1005ec0cf6bf19525d543a3d983c9e0c5834cffd2f46c449701ca9d53f3adce1
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.40.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.40.0.ebuild
deleted file mode 100644
index 2b7371fa38f2..000000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.40.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Framework for syntax highlighting"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtxmlpatterns)
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_install() {
-	kde5_src_install
-	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
-}
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.43.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.43.0.ebuild
index dcea91c13a70..2bbb84dd006e 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.43.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.43.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for syntax highlighting"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 27bdfe4c5ffb..472611769b50 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,3 +1,2 @@
-DIST threadweaver-5.40.0.tar.xz 1409332 BLAKE2B cf48a1086df5ea8ca6dac821e01d74e842639381aee3431231dc0b7a2f8ef536b20d0c22493aca2022840138326ffa7b52a73c8ba212cbe6285320c8d84e2b21 SHA512 7ea45517957a0970370a57f3f2e50fb39b8e4723546d5f0784db14df310ef5ad1820e682da36e109c13a1215992235a9bb878ac2b592f03e31a516976404765b
 DIST threadweaver-5.43.0.tar.xz 1409220 BLAKE2B 4eddba0db7c0bfd3775d514871919760db384ccb92ff5ae79cfaa6d0d08eff66cdb129ec25c7af2bd25633b3103b2e983fd624584795afba84954549cfc2e317 SHA512 0810e64bc4bacc548d1b839633e0fdd178f86bfb80c7e2b77fc185810207c3c2ca7619d982b806d7a0337329a034d09106fedbaea6218df78e46079d703a57c1
 DIST threadweaver-5.44.0.tar.xz 1409408 BLAKE2B 13ca417c6a6c07c4c0f298722eae5b45c6affeeb0068d1a3f628b15af0a8a32ba0c9e00cf2ee22b96ba37306b3cd53aab2b8560ed39384196e0e03c74ba3e1e4 SHA512 f081b219c5565c9c7e2d50a60c629ec4f02bc105a01689afccf36fe31cde288b0b9ab109536490d8dbadc5a2d8b5e740c35f0e2da1e5420a1b564bdaf777ed56
diff --git a/kde-frameworks/threadweaver/threadweaver-5.40.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.40.0.ebuild
deleted file mode 100644
index 1214849cf665..000000000000
--- a/kde-frameworks/threadweaver/threadweaver-5.40.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-src_prepare() {
-	cmake_comment_add_subdirectory benchmarks
-	kde5_src_prepare
-}
diff --git a/kde-frameworks/threadweaver/threadweaver-5.43.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.43.0.ebuild
index 44bbeff6f8d1..39bbc2208fa3 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.43.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index ca64e850c8f3..1bc2c842932e 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 7c73f3887978..e208c163d68d 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,2 +1 @@
 DIST tellico-3.1.1.tar.xz 4584460 BLAKE2B d495c400b7261954cc6f68ef8fe4cf01e9e81573e4de7aaa040b15b26a6c3a8198ca533c11ec5d784cb4e848d5779d6ac244b8cbe5d0addc2d7fa3efde2e103d SHA512 f0fd631c177eadcbb493b630e9127faa745da02e3db041e37e737efa2d2565b5bbf26fca471a7e2dea368b432d38537d975d59a8e4bf216210c2c65266cbcaad
-DIST tellico-3.1.tar.xz 5559552 BLAKE2B 4512ea0780abf0ffae665099318c143b3979904a8a72806f440aa79456de63f8ce76c83c1ae7768405eab72129c4ad60f93ab21f32577e5a655595d0631b4d1c SHA512 6b3ad53bede52564ebd6bdf567d0da290cc77c1ee86c802314a194a680dc7cdc8d097b687f2562c95b72a5cf494e7be024fc00240b7bc2eb01aa7792febd40ad
diff --git a/kde-misc/tellico/tellico-3.1.1.ebuild b/kde-misc/tellico/tellico-3.1.1.ebuild
index 58fc19710b7d..c879158a6951 100644
--- a/kde-misc/tellico/tellico-3.1.1.ebuild
+++ b/kde-misc/tellico/tellico-3.1.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://tellico-project.org/"
 SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
 
 COMMON_DEPEND="
diff --git a/kde-misc/tellico/tellico-3.1.ebuild b/kde-misc/tellico/tellico-3.1.ebuild
deleted file mode 100644
index 528c524070a8..000000000000
--- a/kde-misc/tellico/tellico-3.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A collection manager based on KDE Frameworks"
-HOMEPAGE="http://tellico-project.org/"
-SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 x86"
-IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-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 khtml)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-perl/Text-BibTeX-0.780.0-r1
-	dev-libs/libxml2
-	dev-libs/libxslt
-	cddb? ( $(add_kdeapps_dep libkcddb) )
-	discid? ( dev-libs/libcdio:= )
-	pdf? ( app-text/poppler[qt5] )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	taglib? ( >=media-libs/taglib-1.5 )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xmp? ( >=media-libs/exempi-2 )
-	yaz? ( >=dev-libs/yaz-2:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/tellico:4
-"
-
-# tests need network access
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		$(cmake-utils_use_find_package cddb KF5Cddb)
-		$(cmake-utils_use_find_package discid CDIO)
-		$(cmake-utils_use_find_package pdf PopplerQt5)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package taglib Taglib)
-		-DENABLE_WEBCAM=$(usex v4l)
-		$(cmake-utils_use_find_package xmp Exempi)
-		$(cmake-utils_use_find_package yaz Yaz)
-	)
-
-	kde5_src_configure
-}
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 773ccfadbaf6..3652d88a6404 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/NTED_FONT b/licenses/NTED_FONT
deleted file mode 100644
index 00089a7d6c8d..000000000000
--- a/licenses/NTED_FONT
+++ /dev/null
@@ -1,21 +0,0 @@
-The following exception applies to all included fonts:
-
-/* ---------------------------------------------------------------------------------*/
-
-  As a special exception, if you create a document which uses this font, and
-  embed this font or unaltered portions of this font into the document, this font
-  does not by itself cause the resulting document to be covered by the GNU
-  General Public License. This exception does not however invalidate any other
-  reasons why the document might be covered by the GNU General Public License. If
-  you modify this font, you may extend this exception to your version of the
-  font, but you are not obligated to do so. If you do not wish to do so, delete
-  this exception statement from your version. 
-
-
-/****************************************************************************************/
-/*											*/
-/*  Copyright   Joerg Anders, TU Chemnitz, Fakultaet fuer Informatik, GERMANY           */
-/*		ja@informatik.tu-chemnitz.de						*/
-/*											*/
-/*											*/
-/****************************************************************************************/
diff --git a/licenses/Xerox b/licenses/Xerox
deleted file mode 100644
index 9460a3262acd..000000000000
--- a/licenses/Xerox
+++ /dev/null
@@ -1,39 +0,0 @@
-IMPORTANT PLEASE READ CAREFULLY BEFORE USING THIS PRODUCT:  THIS SOFTWARE LICENSE AGREEMENT ("Agreement") CONTAINS THE LICENSE TERMS AND CONDITIONS FOR THE XEROX SOFTWARE AND RELATED DOCUMENTATION (collectively "Software").
-
-IF YOU DOWNLOAD, INSTALL OR USE THE SOFTWARE, YOU AGREE TO BE LEGALLY BOUND BY THE FOLLOWING TERMS AND CONDITIONS.  IF YOU DO NOT ACCEPT THESE LICENSE TERMS YOU MAY NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE AND YOU MUST DELETE ANY SOFTWARE FILES ACCESSED BY YOU OR A THIRD PARTY ON YOUR BEHALF FROM ANY AND ALL COMPUTER MEMORY INTO WHICH SUCH SOFTWARE HAS BEEN LOADED OR STORED.
-
-When used in this agreement the term "Xerox" shall mean Xerox Corporation, its operating companies, subsidiaries and affiliates.
-
-If you are installing the Software on behalf of the end user you must agree that you are acting as an agent of the end user customer before proceeding.  As agent for the end user you hereby agree that you have either; 1) read and agree to the terms of this Agreement as authorized by the end user, or 2) you have made the end user aware of the license terms and the end user has explicitly accepted them.
-
-1.  LICENSE GRANT.
-a.  Xerox grants to you a non-exclusive, non-transferable license to use the Software on the Xerox-brand equipment ("Equipment") on which it was delivered or, if delivered separately, on a single item of equipment.  You have no other rights to the Software and may not: (1) distribute, copy, modify, create derivatives of, decompile, or reverse engineer Software; (2) activate Software delivered in an inactivated state; or (3) allow others to engage in same.  You may make archival or back-up copies of the Software, provided each copy contains all of the copyright and other proprietary notices contained on the original Software and such copies and is used only for back-up purposes.  Title to, and all intellectual property rights in, Software will reside solely with Xerox and/or its licensors who will be considered third-party beneficiaries of this Agreement with rights of enforcement.
-b.  Software may include or incorporate software provided by Microsoft Corporation ("Microsoft Software").  In addition to all other terms and conditions of this Agreement, the following applies to Your installation and use of Microsoft Software.  You may not: (i) sell, lease, loan, sublicense, or use the Microsoft Software for commercial software hosting services; (ii) publish any benchmark results for the Microsoft Software; (iii) work around any technical limitations in the  Microsoft Software; or (iv) separate components of the Microsoft Software and install them on different pieces of equipment.
-
-2.  THIRD PARTY SOFTWARE.  The Software may include code developed by one or more third parties ("Third Party Software").  Some Third Party Software may be subject to other terms and conditions that may be found in an open source software disclosure package provided with the Software or available for download with the product documentation.  Notwithstanding the terms and conditions of this Agreement, the Third Party Software is licensed to you subject to the terms and conditions of the software license agreement identified in the open source software disclosure.  If the third party terms and conditions include licenses that provide for the availability of source code (such as the GNU General Public License), the open source software disclosure or the media on which the Software may be delivered will contain the source code or provide instructions where a copy of such source code can be obtained.
-
-3.  DISCLAIMER OF WARRANTY.
-a.	YOU ACKNOWLEDGE AND AGREE THAT THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND BY XEROX OR ITS LICENSORS.  XEROX AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, WHETHER CREATED BY STATUTE OR OTHERWISE, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY OR NON-INFRINGEMENT OF THIRD-PARTY RIGHTS.  XEROX AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL MEET YOUR PARTICULAR REQUIREMENTS, THAT IT WILL OPERATE UNINTERRUPTED OR ERROR FREE, OR THAT DEFECTS IN THE SOFTWARE CAN OR WILL BE CORRECTED.  ALL WARRANTIES AND REPRESENTATIONS MADE BY PERSONS OTHER THAN XEROX, INCLUDING, BUT NOT LIMITED TO, YOUR AUTHORIZED SERVICE PROVIDER, DISTRIBUTORS, DEALERS, CONCESSIONAIRES AND OTHER RESELLERS OF XEROX, ARE ALSO DISCLAIMED.  THE WARRANTY DISCLAIMERS SET FORTH HEREIN MAY NOT APPLY IN CERTAIN JURISDICTIONS, IN WHICH CASE THE WARRANTEES HEREUNDER SHALL BE THE MINIMUM REQUIRED BY LAW.
-b.	Software may contain, or be modified to contain, computer code capable of automatically disabling proper operation or functioning of Software and/or the system upon which it is installed.  Such disabling code may be activated (a) if Xerox is denied access to the Software and/or the system as provided herein, (b) you otherwise breach any term of this Agreement, or (c) such license is terminated or expires.
-
-4.  INDEMNIFICATION.  Xerox will pay any settlement agreed to by Xerox or any final judgment for, any claim that Software infringes a third party's valid United States patent or copyright, provided that you promptly notify Xerox in writing of any alleged infringement, allow Xerox to direct the defense, and fully cooperate with Xerox.  Xerox is not responsible for any non-Xerox litigation expenses or settlements unless Xerox agrees to them in writing.  To avoid infringement, even if not alleged, Xerox may, at its option, and at no charge to you, either obtain a license, provide a replacement for the Software or remove or request that you remove the Software.  Xerox's obligations under this section are further conditioned on you immediately removing and ceasing use of the Software in the event that Xerox requests that you remove the Software and/or provides a replacement.  Xerox will not be liable for any infringement-related liability outside the scope of this section, including, without limitation, infringement based upon the Software being modified to your specifications or due to the Software being used in combination with equipment, software or supplies not provided by Xerox.
-
-5.  LIMITATION OF LIABILITY.  Notwithstanding any damages that you might incur, the entire liability of Xerox and its licensors under this Agreement and your exclusive remedy will be limited to the greater of the amount actually paid by you for the Software or U.S. $10.00.  IN NO EVENT WILL XEROX OR ITS LICENSORS BE LIABLE TO YOU FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCUDING BUT NOT LIMITED TO DAMAGES RELATED TO DATA LOSS, LOST PROFITS OR BUSINESS INTERRUPTION) IN ANY WAY ARISING OUT OF OR RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT, EVEN IF XEROX OR ITS LICENSORS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND EVEN IF THE ABOVE REMEDY FAILS OF ITS ESSENTIAL PURPOSE.  THE LIMITATIONS OF LIABILITY SET FORTH HEREIN MAY NOT APPLY IN CERTAIN JURISDICTIONS AND THUS MAY NOT APPLY TO YOU; IN SUCH CASES, XEROX'S AND ITS LICENSORS' LIABILITY HEREUNDER SHALL BE THE MINIMUM REQUIRED BY LAW.
-
-6.  TERMINATION.  Xerox may terminate your license for the Software (i) immediately if you no longer use or possess the equipment with which the Software was provided or are a lessor of the equipment with which the Software was provided and your first lessee no longer uses or possesses it, (ii) upon the termination of any agreement under which you have rented or leased the equipment with which the Software was provided, or (iii) immediately in the event of a breach by you.  If terminated as provided above, you shall return to Xerox all copies of the Software, and remove same from all equipment into which such Software may have been loaded by you.
-
-7.  The Software is provided with Restricted Rights.  You agree to meet all requirements necessary to ensure that the Federal Government will honor such rights.  Disclosure, use or reproduction of the Software and accompanying documentation are subject to restrictions set forth in the Commercial Computer-Restricted Rights clause at Federal Acquisition Regulation 52.227-19, when applicable, or in the Department of Defense Federal Acquisition Regulations Supplement 252.227-7013.
-
-8.  SEVERABLILITY.  If any provision of this Agreement is held invalid by any law, rule, order or regulation of any government, or by the final determination of any state or federal court, such invalidity will not affect the enforceability of any other provisions not held to be invalid. In the event any provision hereof is declared by competent authority to be invalid, illegal or unenforceable under any applicable law, to the extent permissible under applicable law, any such invalid, illegal or unenforceable provision shall be deemed amended lawfully to conform to the intent of the Parties.
-
-9.  NO WAIVER.  Any delay or omission by either party to exercise any right or remedy under this Agreement will not be construed to be a waiver of any such right or remedy or any other right or remedy.  All of the rights of either party under this Agreement will be cumulative and may be exercised separately or concurrently.
-
-10.  GOVERNING LAW.  This Agreement shall be construed in accordance with the laws of the State of New York, without regard to its choice of laws provisions, and disputes shall be adjudicated or otherwise decided in the forums therefor located in the State of New York.  The United Nation Convention on Contracts for International Sales of Goods shall not apply to this Agreement.  Local law may require that certain laws of your country of residence apply to some sections of this Agreement, including but not limited to, requiring this Agreement to be governed by the laws of your country of residence.
-
-11.  EXPORT.  You will not export or re-export the Software without appropriate United States or foreign government licenses or for any purpose prohibited by any applicable export control laws.
-
-12.  ENTIRE AGREEMENT.  This Agreement constitutes the entire agreement between the parties in connection with the subject matter hereof, and supersedes all prior agreements, understandings, negotiations and discussions, whether oral or written, between the parties.  No amendment to or modification of this Agreement will be binding unless it is in writing and signed by a duly authorized representative of each of the parties.
-
-13.  REMOTE SERVICES. Certain models of Equipment are supported and serviced using data that is automatically collected by Xerox or transmitted to or from Xerox by the Equipment connected to Customer's network ("Remote Data") via electronic transmission to a secure off-site location ("Remote Data Access"). Remote Data Access also enables Xerox to transmit to Customer Releases for Software and to remotely diagnose and modify Equipment to repair and correct malfunctions. Examples of Remote Data include product registration, meter read, supply level, Equipment configuration and settings, software version, and problem/fault code data. Remote Data may be used by Xerox for billing, report generation, supplies replenishment, support services, recommending additional products and services, and product improvement/development purposes. Remote Data will be transmitted to and from Customer in a secure manner specified by Xerox. Remote Data Access will not allow Xerox to read, view or download the content of any Customer documents or other information residing on or passing through the Equipment or Customer's information management systems. Customer grants the right to Xerox, without charge, to conduct Remote Data Access for the purposes described above. Upon Xerox's request, Customer will provide contact information for Equipment such as name and address of Customer contact and IP and physical addresses/locations of Equipment. Customer will enable Remote Data Access via a method prescribed by Xerox, and Customer will provide reasonable assistance to allow Xerox to provide Remote Data Access. Unless Xerox deems Equipment incapable of Remote Data Access, Customer will ensure that Remote Data Access is maintained at all times maintenance or support services are being provided.
-
-14.  DIAGNOSTIC SOFTWARE.   Software used to evaluate or maintain Xerox equipment ("Diagnostic Software") may be embedded in, reside on, or may be loaded onto Xerox equipment. The Diagnostic Software and method of entry or access to it constitute valuable trade secrets of Xerox. Title to Diagnostic Software shall at all times remain solely with Xerox and/or its licensors. You agree that (a) your acquisition of the equipment does not grant you a license or right to use Diagnostic Software in any manner, and (b) that unless separately licensed by Xerox to do so, you will not access, use, reproduce, distribute, or disclose Diagnostic Software for any purpose (or allow third parties to do so). You agree at all times to allow Xerox to access, monitor, and otherwise take steps to prevent unauthorized use or reproduction of Diagnostic Software and to remove or disable Diagnostic Software.
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index c7c85d36b424..9b7b620d8b2d 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 5eda82e2b6fc..94bea3662bb5 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
 DIST rspamd-1.6.5.tar.gz 2484271 BLAKE2B 880e862eecd4a082b87bee2ba8c7b17a475efbfe90dbb0cbf34c5ad6c42c80d6ea142f11c7632763d7f9e4155a4521274f2d5a26a77dfbdab9f585bb1e3fff5f SHA512 789abc994cf96a0d88662e14f0e77f95f5c7c7bd1f808ffd64af21cf73cef643b5aee4c1f066d81d04e79d6bb7f72f12095ff08d8515a40bcca23153715fc9f1
+DIST rspamd-1.6.6.tar.gz 2487482 BLAKE2B f18640f64a8c0bcf6077267a1715f0bb096ab18484c24de56a012c42666cdc9f8671237c5336dce7cd47f44f9aba7905ce3723232d53a5b8ddfe143df682bd9b SHA512 14c7144017df69600dbd09541d16dae19d87105b09f95811fc09624b60e89ca68200654e88dea242508afd3c4963ea7cac086abddec8ca1a3d8fc73d7c27e899
diff --git a/mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch b/mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch
new file mode 100644
index 000000000000..4238c838dfa9
--- /dev/null
+++ b/mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch
@@ -0,0 +1,128 @@
+From 2bda2989eee893c42ff04f48a904f00a33a7d07a Mon Sep 17 00:00:00 2001
+From: Vsevolod Stakhov <vsevolod@highsecure.ru>
+Date: Tue, 27 Feb 2018 16:37:44 +0000
+Subject: [PATCH] [CritFix] Do not send reject messages after set reply
+
+Libmilter seems to be totally brain damaged:
+https://github.com/freebsd/freebsd/blob/386ddae58459341ec567604707805814a2128a57/contrib/sendmail/libmilter/engine.c#L66
+
+---
+ src/libserver/milter.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+ Back-ported for rspamd 1.5.6
+
+diff -ur rspamd-1.6.6/src/libserver/milter.c rspamd-1.6.6-badmilter/src/libserver/milter.c
+--- rspamd-1.6.6/src/libserver/milter.c	2018-02-16 13:47:47.000000000 +0000
++++ rspamd-1.6.6-badmilter/src/libserver/milter.c	2018-03-07 16:07:58.591483869 +0000
+@@ -99,6 +99,8 @@
+ 	guint i;
+ 
+ 	if (how & RSPAMD_MILTER_RESET_IO) {
++		msg_debug_milter ("cleanup IO on abort");
++
+ 		DL_FOREACH_SAFE (priv->out_chain, obuf, obuf_tmp) {
+ 			rspamd_milter_obuf_free (obuf);
+ 		}
+@@ -111,8 +113,11 @@
+ 	}
+ 
+ 	if (how & RSPAMD_MILTER_RESET_COMMON) {
++		msg_debug_milter ("cleanup common data on abort");
++
+ 		if (session->message) {
+ 			session->message->len = 0;
++			msg_debug_milter ("cleanup message on abort");
+ 		}
+ 
+ 		if (session->rcpts) {
+@@ -120,30 +125,38 @@
+ 				rspamd_email_address_unref (cur);
+ 			}
+ 
++			msg_debug_milter ("cleanup %d recipients on abort",
++					(gint)session->rcpts->len);
++
+ 			g_ptr_array_free (session->rcpts, TRUE);
+ 			session->rcpts = NULL;
+ 		}
+ 
+ 		if (session->from) {
++			msg_debug_milter ("cleanup from");
+ 			rspamd_email_address_unref (session->from);
+ 			session->from = NULL;
+ 		}
+ 
+ 		if (session->helo) {
++			msg_debug_milter ("cleanup helo");
+ 			session->helo->len = 0;
+ 		}
+ 
+ 		if (session->hostname) {
++			msg_debug_milter ("cleanup hostname");
+ 			session->hostname->len = 0;
+ 		}
+ 
+ 		if (priv->headers) {
++			msg_debug_milter ("cleanup headers");
+ 			g_hash_table_remove_all (priv->headers);
+ 		}
+ 	}
+ 
+ 	if (how & RSPAMD_MILTER_RESET_ADDR) {
+ 		if (session->addr) {
++			msg_debug_milter ("cleanup addr");
+ 			rspamd_inet_address_free (session->addr);
+ 			session->addr = NULL;
+ 		}
+@@ -151,6 +164,7 @@
+ 
+ 	if (how & RSPAMD_MILTER_RESET_MACRO) {
+ 		if (session->macros) {
++			msg_debug_milter ("cleanup macros");
+ 			g_hash_table_unref (session->macros);
+ 			session->macros = NULL;
+ 		}
+@@ -1612,7 +1626,7 @@
+ 		msg_err_milter ("cannot find scan results, tempfail");
+ 		rspamd_milter_send_action (session, RSPAMD_MILTER_TEMPFAIL);
+ 
+-		return;
++		goto cleanup;
+ 	}
+ 
+ 	elt = ucl_object_lookup (results, "action");
+@@ -1621,7 +1635,7 @@
+ 		msg_err_milter ("cannot find action in results, tempfail");
+ 		rspamd_milter_send_action (session, RSPAMD_MILTER_TEMPFAIL);
+ 
+-		return;
++		goto cleanup;
+ 	}
+ 
+ 	rspamd_action_from_str (ucl_object_tostring (elt), &action);
+@@ -1681,7 +1695,6 @@
+ 			}
+ 
+ 			rspamd_milter_set_reply (session, rcode, xcode, reply);
+-			rspamd_milter_send_action (session, RSPAMD_MILTER_REJECT);
+ 		}
+ 		break;
+ 	case METRIC_ACTION_SOFT_REJECT:
+@@ -1696,7 +1709,6 @@
+ 		}
+ 
+ 		rspamd_milter_set_reply (session, rcode, xcode, reply);
+-		rspamd_milter_send_action (session, RSPAMD_MILTER_REJECT);
+ 		break;
+ 
+ 	case METRIC_ACTION_REWRITE_SUBJECT:
+@@ -1741,6 +1753,8 @@
+ 	rspamd_fstring_free (rcode);
+ 	rspamd_fstring_free (xcode);
+ 	rspamd_fstring_free (reply);
++
++	rspamd_milter_session_reset (session, RSPAMD_MILTER_RESET_ABORT);
+ }
+ 
+ void
diff --git a/mail-filter/rspamd/rspamd-1.6.6.ebuild b/mail-filter/rspamd/rspamd-1.6.6.ebuild
new file mode 100644
index 000000000000..8ded37e068e3
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.6.6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils pax-utils user systemd
+
+DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2"
+
+RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	fann? ( sci-mathematics/fann )
+	pcre2? ( dev-libs/libpcre2[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )
+	jit? ( dev-lang/luajit:2 )
+	jemalloc? ( dev-libs/jemalloc )
+	dev-libs/libevent
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	<dev-util/ragel-7.0
+	sys-apps/file
+	gd? ( media-libs/gd[jpeg] )
+	dev-libs/icu
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
+DEPEND="dev-util/ragel
+	${RDEPEND}"
+
+QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
+PATCHES=( "${FILESDIR}/${PV}-dont-send-reject-message-after-set-reply.patch" )
+
+pkg_setup() {
+	enewgroup rspamd
+	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+		-DENABLE_FANN=$(usex fann ON OFF)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rspamd.init-r5" rspamd
+
+	# Remove mprotect for JIT support
+	if use jit; then
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
+	fi
+
+	dodir /var/lib/rspamd
+	dodir /var/log/rspamd
+
+	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/rspamd.logrotate" rspamd
+
+	systemd_newunit rspamd.service rspamd.service
+}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild
index 408d0456c737..7ec04081861a 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 
 # The Makefile.PL script checks for dependencies, but only fails if a
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 0608f16aa399..a33947bd71bb 100644
Binary files a/mate-base/Manifest.gz and b/mate-base/Manifest.gz differ
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.18.2-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.2-r1.ebuild
new file mode 100644
index 000000000000..30752431738a
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.18.2-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE session manager"
+HOMEPAGE="http://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
+	>=dev-libs/glib-2.36:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	virtual/libintl
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
+	systemd? ( sys-apps/systemd )
+	!systemd? ( >=sys-auth/consolekit-0.9.2 )
+	xtrans? ( x11-libs/xtrans )"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xdpyinfo
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	gnome-keyring? ( gnome-base/gnome-keyring )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40:*
+	virtual/pkgconfig:*
+	!<gnome-base/gdm-2.20.4"
+
+MATE_FORCE_AUTORECONF=true
+
+src_configure() {
+	mate_src_configure \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_with systemd) \
+		$(use_with xtrans)  \
+		$(use_enable debug) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	mate_src_install
+
+	dodir /etc/X11/Sessions/
+	exeinto /etc/X11/Sessions/
+	doexe "${FILESDIR}"/MATE
+
+	dodir /usr/share/mate/applications/
+	insinto /usr/share/mate/applications/
+	doins "${FILESDIR}"/defaults.list
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/15-xdg-data-mate
+
+	# This should be done in MATE too, see Gentoo bug #270852
+	doexe "${FILESDIR}"/10-user-dirs-update-mate
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3d577aa856df..cf1a90cd6ffc 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index f43670509b0f..f34f1e28a61b 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1 +1,2 @@
+DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2 SHA512 ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e
 DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 790462beef989b7a3db69d7412cd1076738579906873c8ce6c152b175f6b8305c2949087c9d719d884839e2966088c23309dc2617b3469bc5fa3296d2131e375 SHA512 a826a549d842ba322f7ec5f786d402e81f5b916008be450bacefb7ee976e203427130938c036cc6fca6ea11a8df0ab9b4a39f3bdfedc3cc1a7d31e7a5d11e142
diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild b/media-gfx/freecad/freecad-0.16.6712.ebuild
new file mode 100644
index 000000000000..0c65c49697b2
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.16.6712.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils desktop xdg-utils fortran-2 python-single-r1
+
+DESCRIPTION="Qt based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
+else
+	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-cpp/eigen:3
+	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	dev-libs/xerces-c[icu]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pyside:0[X,svg,${PYTHON_USEDEP}]
+	dev-python/shiboken:0[${PYTHON_USEDEP}]
+	dev-qt/designer:4
+	dev-qt/qtgui:4[-egl]
+	dev-qt/qtopengl:4[-egl]
+	dev-qt/qtsvg:4
+	media-libs/coin
+	media-libs/freetype
+	sci-libs/opencascade:*[vtk(+)]
+	sci-libs/orocos_kdl
+	sys-libs/zlib
+	virtual/glu"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pivy[${PYTHON_USEDEP}]
+	dev-qt/assistant:4"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/swig-2.0.4-r1:0
+	dev-python/pyside-tools:0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
+	"${FILESDIR}"/${PN}-0.17_pre-no-webkit.patch
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=352435
+# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+RESTRICT="mirror"
+
+# TODO:
+#   DEPEND and RDEPEND:
+#		salome-smesh - science overlay
+#		zipio++ - not in portage yet
+
+S="${WORKDIR}/FreeCAD-${PV}"
+
+DOCS=( README.md ChangeLog.txt )
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ -z ${CASROOT} ]] && die "empty \$CASROOT, run eselect opencascade set or define otherwise"
+}
+
+src_configure() {
+	export QT_SELECT=4
+
+	#-DOCC_* defined with cMake/FindOpenCasCade.cmake
+	#-DCOIN3D_* defined with cMake/FindCoin3D.cmake
+	#-DSOQT_ not used
+	local mycmakeargs=(
+		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+		-DCMAKE_INSTALL_DATADIR=share/${P}
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=include/${P}
+		-DFREECAD_USE_EXTERNAL_KDL=ON
+		-DBUILD_WEB=OFF
+	)
+
+	# TODO to remove embedded dependencies:
+	#
+	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++
+	#                (under src/zipios++) will be used
+	#	salomesmesh is in 3rdparty but upstream's find_package function is not complete yet to compile against external version
+	#                (external salomesmesh is available in "science" overlay)
+
+	cmake-utils_src_configure
+	einfo "${P} will be built against opencascade version ${CASROOT}"
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	make_desktop_entry FreeCAD "FreeCAD" "" "" "MimeType=application/x-extension-fcstd;"
+
+	# install mimetype for FreeCAD files
+	insinto /usr/share/mime/packages
+	newins "${FILESDIR}"/${PN}.sharedmimeinfo "${PN}.xml"
+
+	# install icons to correct place rather than /usr/share/freecad
+	pushd "${ED%/}"/usr/share/${P} || die
+	local size
+	for size in 16 32 48 64; do
+		newicon -s ${size} freecad-icon-${size}.png freecad.png
+	done
+	doicon -s scalable freecad.svg
+	newicon -s 64 -c mimetypes freecad-doc.png application-x-extension-fcstd.png
+	popd || die
+
+	python_optimize "${ED%/}"/usr/{,share/${P}/}Mod/
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index 2d1f741ddafa..be1c0511d2c6 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.2-unused-dependency.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.2-unused-dependency.patch
new file mode 100644
index 000000000000..32dc4a084c8d
--- /dev/null
+++ b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.2-unused-dependency.patch
@@ -0,0 +1,38 @@
+From aa8937f6774846112a0dfa980d77d91398056c99 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Mon, 12 Mar 2018 15:57:49 +1100
+Subject: [PATCH] Remove unused dependency.
+
+---
+ CMakeLists.txt          | 1 -
+ src/part/CMakeLists.txt | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e1a23cb..f6fb447 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     CoreAddons
+     DocTools
+     Parts
+-    KIO
+     WidgetsAddons
+     IconThemes
+ )
+diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
+index 65a31e7..0e70be8 100644
+--- a/src/part/CMakeLists.txt
++++ b/src/part/CMakeLists.txt
+@@ -64,7 +64,7 @@ ki18n_wrap_ui(kgraphviewerlib_LIB_SRCS ${kgraphviewerprinting_UI} )
+ 
+ add_library(kgraphviewerlib ${kgraphviewerlib_LIB_SRCS})
+ 
+-target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::KIOWidgets KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
++target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
+ 
+ set_target_properties(kgraphviewerlib PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${KGRAPHVIEWER_SOVERSION} OUTPUT_NAME kgraphviewer )
+ 
+-- 
+2.16.1
+
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.2.ebuild
index 0a59fe5f203c..b916dd4c59ed 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.2.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,8 +10,8 @@ DESCRIPTION="Graphviz dot graph file viewer"
 HOMEPAGE="https://www.kde.org/applications/graphics/kgraphviewer/"
 [[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -36,3 +36,5 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!media-gfx/kgraphviewer:4
 "
+
+PATCHES=( "${FILESDIR}/${P}-unused-dependency.patch" )
diff --git a/media-gfx/pdf2svg/Manifest b/media-gfx/pdf2svg/Manifest
index 2328a991a558..d6c7c05bb60b 100644
--- a/media-gfx/pdf2svg/Manifest
+++ b/media-gfx/pdf2svg/Manifest
@@ -1,3 +1 @@
-DIST pdf2svg-0.2.1.tar.gz 77601 BLAKE2B deb112515f9c9062a24be1d129a5e74f2c574a8146739a843ad057275585411a7c861aaa026f51d48dc798c474d5a538c2f606400991751ae803e855fead2daa SHA512 17b54ed40f38982452206a9e7eb6fd309906904af10ef375d7e3894e7d8d8a351a5c47ef6553678db48373c5de878923fd46a66cc3e22a01034434fde9671793
-DIST pdf2svg-0.2.2.tar.gz 84009 BLAKE2B b7b61ee050197f4d760950c3e00d25f3ab60acb9debe809bb974d335097902a451d1c075cfe4c650e0256e58c169f2b36c9b78336142533ed06cdc7c2b68d5fc SHA512 ea8b3d33acc7900d162a338b715d55a0cda578e2f08afcbe2773558998b267134ce0c34d5ed295d3dcb2bf882f0097835a6ba83fc837a201173e4c67b9d4dca3
 DIST pdf2svg-0.2.3.tar.gz 89461 BLAKE2B 5857935195429f43cf9d6dc3bd66a88945be45225f0ae8324762937b7bfe407f0c4fb4013069d4eda2f0e036710a1a78b261093c18e4693622cc6fc9f7fd7916 SHA512 e8f0cc34c112c7d9ae02396ca587f1354462add882501f003b0173e05ebb09c09456dc1736679674fec5a2c04bdc0ef4141266090ba7efeba8b194ee602f5ee2
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
deleted file mode 100644
index 9494d3e45e1d..000000000000
--- a/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="pdf2svg is based on poppler and cairo and can convert pdf to svg files"
-HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/"
-SRC_URI="http://www.cityinthesky.co.uk/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-text/poppler-0.12.3-r3:=[cairo]
-	>=x11-libs/cairo-1.2.6:=[svg]
-	x11-libs/gtk+:2="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e 's:#include <stdio.h>:#include <stdio.h>\n#include <stdlib.h>:' \
-		${PN}.c || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild
deleted file mode 100644
index 2eae4fdc0ed5..000000000000
--- a/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="pdf2svg is based on poppler and cairo and can convert pdf to svg files"
-HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/"
-SRC_URI="http://www.cityinthesky.co.uk/wp-content/uploads/2013/10/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-text/poppler-0.12.3-r3:=[cairo]
-	>=x11-libs/cairo-1.2.6:=[svg]
-	x11-libs/gtk+:2="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS" # ChangeLog is only for <=0.2.1 and README.md doesn't have anything useful for usage
-
-src_prepare() {
-	sed -i \
-		-e 's:#include <stdio.h>:#include <stdio.h>\n#include <stdlib.h>:' \
-		${PN}.c || die
-}
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild
index 929275c637a0..71d62a3a7b69 100644
--- a/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild
+++ b/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild
@@ -9,10 +9,10 @@ SRC_URI="https://github.com/dawbarton/pdf2svg/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=">=app-text/poppler-0.12.3-r3:=[cairo]
+RDEPEND=">=app-text/poppler-0.12.3-r3[cairo]
 	>=x11-libs/cairo-1.2.6:=[svg]
 	x11-libs/gtk+:2="
 DEPEND="${RDEPEND}
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
new file mode 100644
index 000000000000..307592128283
--- /dev/null
+++ b/media-gfx/qimgv/Manifest
@@ -0,0 +1 @@
+DIST qimgv-0.6.tar.gz 232586 BLAKE2B 077210c16906dbc746f18295f80ac8ea5f948b4abba366659826ebd0ebad1876da53be26a3855c58a2f25e2cfc02fb2ef030a74e17e89f92b2aef572e58a8e0c SHA512 50156a6bdf08e8cc82d30ad23d1deef7f0c119c970c8e577d8b0de65f6b11827e0cf57593834ae7e8887dce5d83215cbd98e9c5b8905d6a3580943e432bdb6cb
diff --git a/media-gfx/qimgv/metadata.xml b/media-gfx/qimgv/metadata.xml
new file mode 100644
index 000000000000..ccef191fae16
--- /dev/null
+++ b/media-gfx/qimgv/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jeff.no.zhao@gmail.com</email>
+		<name>Jiayi Zhao</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/qimgv/qimgv-0.6.ebuild b/media-gfx/qimgv/qimgv-0.6.ebuild
new file mode 100644
index 000000000000..1d1623a2470c
--- /dev/null
+++ b/media-gfx/qimgv/qimgv-0.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5"
+HOMEPAGE="https://github.com/easymodo/qimgv"
+SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-video/mpv[libmpv]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# so cmake can find binaries
+	sed -i 's/build\/qimgv/${CMAKE_BINARY_DIR}\/qimgv/' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/qimgv/qimgv-9999.ebuild b/media-gfx/qimgv/qimgv-9999.ebuild
new file mode 100644
index 000000000000..a5955797418a
--- /dev/null
+++ b/media-gfx/qimgv/qimgv-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3 cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5."
+HOMEPAGE="https://github.com/easymodo/qimgv"
+
+EGIT_REPO_URI="https://github.com/easymodo/qimgv.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-video/mpv[libmpv]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/scour/scour-0.36.ebuild b/media-gfx/scour/scour-0.36.ebuild
index b975d46f12e2..46c55274f05c 100644
--- a/media-gfx/scour/scour-0.36.ebuild
+++ b/media-gfx/scour/scour-0.36.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e501729c6bcc..e27dba34c073 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild
index 6880fa4cc0e9..147ec0c3800e 100644
--- a/media-libs/coin/coin-3.1.3-r2.ebuild
+++ b/media-libs/coin/coin-3.1.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home"
 SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-2 PEL )"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="bzip2 debug doc javascript openal simage static-libs threads zlib"
 
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index f7a0212670e0..3faadb8f17c2 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,2 +1 @@
-DIST libextractor-1.3.tar.gz 7942021 BLAKE2B 76856cd70b1981b95db55b7070d5e82574e8842f49dc3ee7cfc6f35f71b66f7b8e642b82cbbaa8446488ab29ca39c9792e4153f3cd9624dde731b3daefe2e86f SHA512 38ed47e5e5f50ddf216408f698a104900baa3b03cc8a81a14e63afd30b3e3922acda17363d88d9ba1356ebf70287c8a5152ff6933a36ec1042ca0d832218d45d
 DIST libextractor-1.6.tar.gz 8053454 BLAKE2B cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c SHA512 1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
diff --git a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
deleted file mode 100644
index b6e0b41773b3..000000000000
--- a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/src/plugins/exiv2_extractor.cc	2013-06-25 13:02:05.000000000 +0200
-+++ b/src/plugins/exiv2_extractor.cc	2017-06-10 14:22:57.000000000 +0200
-@@ -180,7 +180,11 @@
-    *
-    * @return -1 on error
-    */
-+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+  virtual size_t size (void) const;
-+#else
-   virtual long int size (void) const;
-+#endif
- 
-   /**
-    * Check if file is open.
-@@ -445,7 +449,11 @@
-  *
-  * @return -1 on error
-  */
--long int 
-+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+size_t
-+#else
-+long int
-+#endif
- ExtractorIO::size (void) const
- {
-   return (long) ec->get_size (ec->cls);
diff --git a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch
deleted file mode 100644
index d9e50b698ac8..000000000000
--- a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-Last-Update: <2015-11-28>
-
---- libextractor-1.3.orig/src/plugins/thumbnailffmpeg_extractor.c
-+++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c
-@@ -153,7 +153,7 @@ seek_cb (void *opaque,
- static size_t 
- create_thumbnail (int src_width, int src_height, 
- 		  int src_stride[],
--		  enum PixelFormat src_pixfmt, 
-+		  enum AVPixelFormat src_pixfmt,
- 		  const uint8_t * const src_data[],
- 		  int dst_width, int dst_height,
- 		  uint8_t **output_data, 
-@@ -189,7 +189,7 @@ create_thumbnail (int src_width, int src
-   if (NULL == 
-       (scaler_ctx =
-        sws_getContext (src_width, src_height, src_pixfmt,
--		       dst_width, dst_height, PIX_FMT_RGB24, 
-+		       dst_width, dst_height, AV_PIX_FMT_RGB24,
- 		       SWS_BILINEAR, NULL, NULL, NULL)))
-     {
- #if DEBUG
-@@ -214,7 +214,7 @@ create_thumbnail (int src_width, int src
-       return 0;
-     }
-   if (NULL == (dst_buffer =
--	       av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
-+	       av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height))))
-     {
- #if DEBUG
-       fprintf (stderr,
-@@ -229,7 +229,7 @@ create_thumbnail (int src_width, int src
-       return 0;
-     }
-   avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
--                  PIX_FMT_RGB24, dst_width, dst_height);
-+                  AV_PIX_FMT_RGB24, dst_width, dst_height);
-   sws_scale (scaler_ctx,
-              src_data, 
-              src_stride,
-@@ -272,7 +272,7 @@ create_thumbnail (int src_width, int src
-     }
-   encoder_codec_ctx->width = dst_width;
-   encoder_codec_ctx->height = dst_height;
--  encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
-+  encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24;
-   opts = NULL;
-   if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
-     {
-
diff --git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
deleted file mode 100644
index 4893f9784a58..000000000000
--- a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/571902
-
-------------------------------------------------------------------------
-r34095 | LRN | 2014-07-31 10:58:51 -0400 (Thu, 31 Jul 2014) | 1 line
-
-Add giflib-5.1.0 compatibility
-
-Index: src/plugins/gif_extractor.c
-===================================================================
---- a/src/plugins/gif_extractor.c	(revision 34094)
-+++ b/src/plugins/gif_extractor.c	(revision 34095)
-@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
-   if (gif_file == NULL || gif_error != 0)
-   {
-     if (gif_file != NULL)
-+#if GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
-       EGifCloseFile (gif_file);
-+#else
-+      EGifCloseFile (gif_file, NULL);
-+#endif
-     return; /* not a GIF */
-   }
- #endif
-@@ -133,7 +137,11 @@ EXTRACTOR_gif_extract_method (struct EXT
- 	       DGifGetExtensionNext(gif_file, &ext)) &&
- 	      (NULL != ext) ) ; /* keep going */
-     }
-+#if defined (GIF_LIB_VERSION) || GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
-   DGifCloseFile (gif_file);
-+#else
-+  DGifCloseFile (gif_file, NULL);
-+#endif
- }
- 
- /* end of gif_extractor.c */
-
-------------------------------------------------------------------------
diff --git a/media-libs/libextractor/libextractor-1.3-r1.ebuild b/media-libs/libextractor/libextractor-1.3-r1.ebuild
deleted file mode 100644
index dc06475abc4f..000000000000
--- a/media-libs/libextractor/libextractor-1.3-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library to extract metadata from files of arbitrary type"
-HOMEPAGE="https://www.gnu.org/software/libextractor/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2
-	media-gfx/exiv2:=
-	sys-devel/libtool
-	virtual/libiconv
-	virtual/libintl
-	archive? ( app-arch/libarchive:= )
-	bzip2? ( app-arch/bzip2 )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	gif? ( media-libs/giflib:= )
-	gsf? ( gnome-extra/libgsf:= )
-	gtk? ( x11-libs/gtk+:3 )
-	jpeg? ( virtual/jpeg:0 )
-	magic? ( sys-apps/file )
-	midi? ( media-libs/libsmf )
-	mp4? ( media-libs/libmp4v2:0 )
-	mpeg? ( media-libs/libmpeg2 )
-	tidy? ( app-text/htmltidy )
-	tiff? ( media-libs/tiff:0 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-# test? ( app-forensics/zzuf )
-RDEPEND="${COMMON_DEPEND}
-	!sci-biology/glimmer
-	!sci-chemistry/pdb-extract
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-giflib-5.patch #571902
-	"${FILESDIR}"/${P}-ffmpeg-2.9.patch
-	"${FILESDIR}"/${P}-exiv2-0.26.patch #621242
-)
-
-src_prepare() {
-	default
-
-	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
-	sed -i \
-		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
-		-e 's:tidy/tidy.h:tidy.h:' \
-		-e 's:tidy/buffio.h:buffio.h:' \
-		configure src/plugins/html_extractor.c || die
-
-	if ! use tidy; then
-		sed -i -e 's:tidy.h:dIsAbLe&:' configure || die
-	fi
-}
-
-src_configure() {
-	e_ac_cv() {
-		export ac_cv_"$@"
-	}
-
-	e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
-
-	e_ac_cv header_FLAC_all_h=$(usex flac)
-	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac)
-	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac)
-
-	e_ac_cv header_archive_h=$(usex archive)
-	e_ac_cv header_bzlib_h=$(usex bzip2)
-	e_ac_cv header_gif_lib_h=$(usex gif)
-	e_ac_cv header_jpeglib_h=$(usex jpeg)
-	e_ac_cv header_magic_h=$(usex magic)
-	e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
-	e_ac_cv header_tiffio_h=$(usex tiff)
-	e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
-	e_ac_cv header_zlib_h=$(usex zlib)
-	e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
-	e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
-
-	# gstreamer support is for 1.0, no 0.10 support
-	econf \
-		--disable-static \
-		--enable-experimental \
-		--enable-glib \
-		--with-gtk_version=$(usex gtk 3.0.0 false) \
-		--without-gstreamer \
-		--disable-gsf-gnome \
-		$(use_enable gsf) \
-		$(use_enable ffmpeg)
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild b/media-libs/libextractor/libextractor-1.6.ebuild
index d52277c895c2..cf862f1f85c0 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
 
 RESTRICT="test"
diff --git a/media-libs/libfreehand/libfreehand-0.1.2.ebuild b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
index dc669643a69a..d870d0bb1dd7 100644
--- a/media-libs/libfreehand/libfreehand-0.1.2.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
index bf509a149801..2216160bcb6b 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 RDEPEND="
diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild
index 3b6e40d1cafa..21d6246ddb1a 100644
--- a/media-libs/simage/simage-1.7.0-r1.ebuild
+++ b/media-libs/simage/simage-1.7.0-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://bitbucket.org/Coin3D/simage"
 SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
 
 LICENSE="public-domain mpeg2enc"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 x86"
 SLOT="0"
 IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib"
 RESTRICT="mirror bindist" #465086
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch
new file mode 100644
index 000000000000..0100d1356c48
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch
@@ -0,0 +1,33 @@
+From 641052deaaa6a570a6c284d5407ac1bbd60d3d53 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <commendsarnex@gmail.com>
+Date: Sun, 11 Mar 2018 11:18:25 -0400
+Subject: [PATCH] Do not require external sources to build
+
+Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
+---
+ CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34e10dc3..5fb97b7c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -361,7 +361,6 @@ add_custom_target(generate_helper_files DEPENDS
+     vk_dispatch_table_helper.h
+     vk_extension_helper.h
+     vk_typemap_helper.h
+-    spirv_tools_commit_id.h
+     )
+ set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER})
+ 
+@@ -376,7 +375,6 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h)
+ run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
+ run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
+ run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
+-run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
+ 
+ 
+ 
+-- 
+2.16.2
+
diff --git a/media-libs/vulkan-loader/metadata.xml b/media-libs/vulkan-loader/metadata.xml
index 1c806f32b436..9e5a300d8633 100644
--- a/media-libs/vulkan-loader/metadata.xml
+++ b/media-libs/vulkan-loader/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">KhronosGroup/Vulkan-LoaderAndValidationLayers</remote-id>
 	</upstream>
+	<use>
+		<flag name="demos">Build vulkan demos and vulkaninfo</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index c4fe082f0783..bb9cb32772dc 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -7,6 +7,8 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
 	inherit git-r3
+
+	PATCHES=( "${FILESDIR}/${P}-no-external-sources.patch" )
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
@@ -20,19 +22,23 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="wayland X"
+IUSE="demos wayland X"
 
 RDEPEND=""
 DEPEND="${PYTHON_DEPS}
+	demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )"
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
 		-DBUILD_TESTS=False
 		-DBUILD_LAYERS=False
-		-DBUILD_DEMOS=False
+		-DBUILD_DEMOS=$(usex demos)
 		-DBUILD_VKJSON=False
 		-DBUILD_LOADER=True
 		-DBUILD_WSI_MIR_SUPPORT=False
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 72780d72290b..93de8c041115 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch
similarity index 92%
rename from media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
rename to media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch
index e0100eedf7cc..59a5486e2cad 100644
--- a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch
@@ -30,7 +30,7 @@ index 96dbf47a..2caab298 100644
  #Installation paths
  # TODO remove data from path
 -SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data")
-+SET(SYS_DATA_PATH "${CMAKE_FULL_INSTALL_DATAROOTDIR}/hydrogen/data")
++SET(SYS_DATA_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen/data")
  # TODO remove data from path, could be .config/hydrogen
  SET(USR_DATA_PATH ".hydrogen/data")
  
@@ -42,10 +42,10 @@ index 96dbf47a..2caab298 100644
 -	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
 -	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps")
 -	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/appdata")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/applications")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/pixmaps")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_FULL_INSTALL_MANDIR}/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
  ENDIF()
  
  #
@@ -76,7 +76,7 @@ diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
  IF(NOT APPLE AND NOT WIN32)
      INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
 -    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" )
-+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_FULL_INSTALL_INCLUDEDIR}/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
  ENDIF()
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
 --- a/src/gui/CMakeLists.txt
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
similarity index 93%
rename from media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
rename to media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
index 4033354017a8..61d6269e79d3 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 COMMIT=1a477ffe380f153c5d9fb3495d9874df7f75334f
-inherit cmake-utils git-r3 vcs-snapshot xdg-utils
+inherit cmake-utils vcs-snapshot xdg-utils
 
 DESCRIPTION="Advanced drum machine"
 HOMEPAGE="http://www.hydrogen-music.org/"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
 
 REQUIRED_USE="lash? ( alsa )"
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" )
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 3d14fb4a6533..c5712d4665c7 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.0.0_pre20180301-gnuinstalldirs.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index 5901a5e4a29c..65b3c158b6c4 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -1,2 +1 @@
-DIST terminatorX-3.84.tar.gz 572143 BLAKE2B 9ee576ae34b5349347a4f8dda429d5366ad6e8f9d1907e3cf22af3287e6340d616b59e5f3e56d56b6652768ac216c5ac8e598eb4fac54291fb00ce8bc6dd2d0c SHA512 9b538007acc98b1dd7bb2e310be53bcf1971a94e5c03ea8ca48c59b05f1a0bddd75bf30ab4cfb03d49165098ba63643eaa3bda117cdf833df2438c29a774db6c
 DIST terminatorX-4.0.1.tar.bz2 1832692 BLAKE2B 61eeb6362cdf56cb73df3bfbff65cf3699a0ef686d77894b87feab5f25f927267bc28573c3ee41981ded3b452b1d37c035260ffbe0fdcf6d0b0c0319c61a6137 SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093
diff --git a/media-sound/terminatorx/files/terminatorx-3.84-includes.patch b/media-sound/terminatorx/files/terminatorx-3.84-includes.patch
deleted file mode 100644
index 792ac1db5f00..000000000000
--- a/media-sound/terminatorx/files/terminatorx-3.84-includes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/tX_mouse.cc b/src/tX_mouse.cc
---- a/src/tX_mouse.cc
-+++ b/src/tX_mouse.cc
-@@ -50,2 +50,3 @@
- #include <stdlib.h>
-+#include <string.h> /* strcmp() */
- 
-diff --git a/src/tX_mouse.h b/src/tX_mouse.h
---- a/src/tX_mouse.h
-+++ b/src/tX_mouse.h
-@@ -38,2 +38,3 @@
- #include <gdk/gdkkeysyms.h>
-+#include <gtk/gtk.h> /* GtkWidget */
- 
-diff --git a/src/tX_vttgui.cc b/src/tX_vttgui.cc
---- a/src/tX_vttgui.cc
-+++ b/src/tX_vttgui.cc
-@@ -61,2 +61,3 @@
- #include <stdio.h>
-+#include <string.h> /* strrchr() */
- #include <ctype.h>
-diff --git a/src/tX_global.h b/src/tX_global.h
---- a/src/tX_global.h
-+++ b/src/tX_global.h
-@@ -37,2 +37,3 @@ extern "C" {
- #include <stdio.h>
-+#include <string.h> /* strcpy() */
- #include "tX_types.h"
diff --git a/media-sound/terminatorx/files/terminatorx-3.84-new-zlib.patch b/media-sound/terminatorx/files/terminatorx-3.84-new-zlib.patch
deleted file mode 100644
index 87b9ca85378c..000000000000
--- a/media-sound/terminatorx/files/terminatorx-3.84-new-zlib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix FTBFS errors with newer zlib.
-Author: Moritz Muehlenhoff <muehlenhoff@univention.de>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663053
-Forwarded: no
----
- src/tX_midiin.cc |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/tX_midiin.cc
-+++ b/src/tX_midiin.cc
-@@ -447,7 +447,7 @@ gboolean tX_midiin::midi_learn_destroy(G
- 
- void tX_midiin::store_connections(FILE *rc, char *indent) 
- {
--	gzFile *rz=NULL;
-+	gzFile rz=NULL;
- 	
- 	tX_store("%s<midi_connections>\n", indent);
- 
diff --git a/media-sound/terminatorx/terminatorx-3.84-r1.ebuild b/media-sound/terminatorx/terminatorx-3.84-r1.ebuild
deleted file mode 100644
index 45ee96f9e99d..000000000000
--- a/media-sound/terminatorx/terminatorx-3.84-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils
-
-MY_P=${P/terminatorx/terminatorX}
-
-DESCRIPTION="Realtime audio synthesizer allowing you to 'scratch' on sampled audio data"
-HOMEPAGE="http://www.terminatorx.org/"
-SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug mad vorbis sox"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	mad? ( media-sound/madplay )
-	vorbis? ( media-libs/libvorbis )
-	sox? ( media-sound/sox
-		media-sound/mpg123 )
-	>=x11-libs/gtk+-2.2:2
-	>=dev-libs/glib-2.2:2
-	x11-libs/libXi
-	x11-libs/libXxf86dga
-	dev-libs/libxml2
-	media-libs/audiofile
-	media-libs/ladspa-sdk
-	media-libs/ladspa-cmt
-	app-text/scrollkeeper
-	media-libs/liblrdf
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/xf86dgaproto
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Patch from debian to compile with recent zlib
-	epatch "${FILESDIR}"/${PN}-3.84-new-zlib.patch
-	epatch "${FILESDIR}"/${PN}-3.84-includes.patch
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable mad) \
-		$(use_enable vorbis) \
-		$(use_enable sox)
-}
-
-src_install() {
-	gnome2_src_install
-	newicon gnome-support/terminatorX-app.png terminatorX.png
-	make_desktop_entry terminatorX terminatorX terminatorX AudioVideo
-}
diff --git a/media-sound/ventrilo-server-bin/Manifest b/media-sound/ventrilo-server-bin/Manifest
index 7fddcec5b05b..5e0d70ed71fa 100644
--- a/media-sound/ventrilo-server-bin/Manifest
+++ b/media-sound/ventrilo-server-bin/Manifest
@@ -1,2 +1 @@
-DIST ventrilo_srv-2.3.1-Linux-i386.tar.gz 166862 BLAKE2B 6eb4c55088d2aa6c9c7da0973f96dc849c9b0a93994206ed7ffcf2abdcce3fa73f0bead50158fc74c9275bfc7964826ce3b22328aaf0d73434a1185e3ca6b34e SHA512 01e8bce092f8b1ef0f08e736040871e221f4e039d21671d451abfcaf077be104e1f3488b90661e4895118d971f5e56040a01290734a02a4d5e67d183dc91cd5d
 DIST ventrilo_srv-3.0.3-Linux-i386.tar.gz 211494 BLAKE2B e75fba4c9f660de84913728aa0ad08af65b07004368640e47810110c0f694634d00421226accd904f23e2141e6be849da31b3604fe441f6ad610db2a1eb58147 SHA512 ac4b38d7ee5cb66b88507e5cfb810d28b98252dfbabdb8d3777ae4b4dfd7a793ae8e0ee0a4d3a03cf7d0d1b1b34162e5f026c7217d296201e48607e44f04e79f
diff --git a/media-sound/ventrilo-server-bin/files/conf.d.ventrilo b/media-sound/ventrilo-server-bin/files/conf.d.ventrilo
deleted file mode 100644
index 88632d732fe0..000000000000
--- a/media-sound/ventrilo-server-bin/files/conf.d.ventrilo
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set the default nice priority level.  See NICE(1) for more information.
-NICE=-5
diff --git a/media-sound/ventrilo-server-bin/files/init.d.ventrilo b/media-sound/ventrilo-server-bin/files/init.d.ventrilo
deleted file mode 100644
index e265109ada0a..000000000000
--- a/media-sound/ventrilo-server-bin/files/init.d.ventrilo
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-        # the daemon needs the internet to function
-	# Not sure if net is needed to start but it is required for it to work properly.
-        need net   
-}
-
-start() {
-        # display to the user what you're doing
-        ebegin "Starting Ventrilo VoIP Server"  
-        nice -n ${NICE} /opt/ventrilo-server/ventrilo_srv -f/opt/ventrilo-server/ventrilo_srv -d 
-	eend $?
-}
-
-stop() {
-        # display a message to the user
-        ebegin "Stopping Ventrilo VoIP Server"
-        start-stop-daemon --stop --pidfile /opt/ventrilo-server/ventrilo_srv.pid
-        eend $?
-}
-
diff --git a/media-sound/ventrilo-server-bin/metadata.xml b/media-sound/ventrilo-server-bin/metadata.xml
index 7f14d8fcefb8..ee7258ac28eb 100644
--- a/media-sound/ventrilo-server-bin/metadata.xml
+++ b/media-sound/ventrilo-server-bin/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
diff --git a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild
deleted file mode 100644
index 73d2c83184b5..000000000000
--- a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-IUSE=""
-DESCRIPTION="The Ventrilo Voice Communication Server"
-HOMEPAGE="http://www.ventrilo.com/"
-SRC_URI="ventrilo_srv-${PV}-Linux-i386.tar.gz"
-
-LICENSE="ventrilo"
-SLOT="0"
-KEYWORDS="-* x86 amd64"
-RESTRICT="fetch"
-
-S=${WORKDIR}
-
-RDEPEND="sys-libs/glibc"
-DEPEND=""
-
-QA_PRESTRIPPED="opt/ventrilo-server/ventrilo_srv
-	opt/ventrilo-server/ventrilo_status"
-
-pkg_nofetch() {
-	einfo "Please visit http://www.ventrilo.com/download.php"
-	einfo "and download the Linux i386 - 32bit ${PV} server."
-	einfo "Just save it in ${DISTDIR} !"
-}
-
-src_install() {
-	exeinto /opt/ventrilo-server
-	doexe ventrilo_{srv,status}
-
-	newinitd "${FILESDIR}"/init.d.ventrilo ventrilo
-	newconfd "${FILESDIR}"/conf.d.ventrilo ventrilo
-
-	insinto /opt/ventrilo-server
-	doins ventrilo_srv.ini
-
-	dohtml ventrilo_srv.htm
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 69ecc96c0c51..b2fc0b103176 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
index 87eac94f303a..ad5b411cc743 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
new file mode 100644
index 000000000000..1594617fba9a
--- /dev/null
+++ b/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
@@ -0,0 +1,28 @@
+player: make ffmpeg/libav version check non-fatal
+
+We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
+
+diff --git a/player/main.c b/player/main.c
+index 5a3fe4c1b7..8cfbb09c56 100644
+--- a/player/main.c
++++ b/player/main.c
+@@ -429,13 +429,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
+         // Distro maintainers who patch this out should be aware that mpv
+         // intentionally ignores ABI in some places where it's not possible to
+         // get by without violating it.
+-        print_libav_versions(mpctx->log, MSGL_FATAL);
+-        MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
+-                 "FFmpeg/Libav than the shared\nlibrary it is linked against. "
+-                 "This is most likely a broken build and could\nresult in "
+-                 "misbehavior and crashes.\n\nmpv does not support this "
+-                 "configuration and will not run - rebuild mpv instead.\n");
+-        return -1;
++        print_libav_versions(mpctx->log, MSGL_WARN);
++        MP_WARN(mpctx, "\nmpv was compiled against a different version of "
++                "FFmpeg/Libav than the shared\nlibrary it is linked against. "
++                "This could result in misbehavior and crashes.\n\n"
++                "Upstream does not support this configuration.\n"
++                "Please rebuild mpv in case of any problems.\n");
+     }
+
+     if (!mpctx->playlist->first && !opts->player_idle_mode)
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index e273db3d080b..302641687d69 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -132,7 +132,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+	"${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch"
 )
 
 src_prepare() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8eb2f2aefe39..67beb10f3294 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/Manifest.gz b/metadata/dtd/Manifest.gz
index 3440f5e9cb78..b341b855266e 100644
Binary files a/metadata/dtd/Manifest.gz and b/metadata/dtd/Manifest.gz differ
diff --git a/metadata/dtd/metadata.dtd b/metadata/dtd/metadata.dtd
index d7ef81c7f750..cb38299aeab3 100644
--- a/metadata/dtd/metadata.dtd
+++ b/metadata/dtd/metadata.dtd
@@ -3,7 +3,7 @@
 <!ATTLIST catmetadata pkgname CDATA "">
 
 <!-- Metadata for a package -->
-<!ELEMENT pkgmetadata ( (maintainer|longdescription|slots|use|upstream)* )>
+<!ELEMENT pkgmetadata ( (maintainer|longdescription|slots|stabilize-allarches|use|upstream)* )>
 <!ATTLIST pkgmetadata pkgname CDATA "">
 
   <!-- One tag for each maintainer of a package, multiple allowed-->
@@ -28,6 +28,9 @@
     <!-- The meaning of sub-SLOTs for the whole package -->
     <!ELEMENT subslots (#PCDATA)* >
 
+  <!-- whether it's possible to stabilize ALLARCHES -->
+  <!ELEMENT stabilize-allarches EMPTY>
+
   <!-- description of what this USE flag does for this package -->
   <!ELEMENT use (flag)* >
     <!ELEMENT flag (#PCDATA|pkg|cat)* >
@@ -81,6 +84,7 @@
   <!ATTLIST maintainer restrict CDATA #IMPLIED >
   <!ATTLIST longdescription restrict CDATA #IMPLIED >
   <!ATTLIST flag restrict CDATA #IMPLIED >
+  <!ATTLIST stabilize-allarches restrict CDATA #IMPLIED >
 
 <!-- standard parts -->
 <!-- an email address -->
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7f39f15d20b7..19aef3166834 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Mar 2018 12:38:28 +0000
+Tue, 13 Mar 2018 19:38:12 +0000
diff --git a/metadata/dtd/timestamp.commit b/metadata/dtd/timestamp.commit
index 2dad15849820..10a1acd1d17e 100644
--- a/metadata/dtd/timestamp.commit
+++ b/metadata/dtd/timestamp.commit
@@ -1 +1 @@
-c9496010c9bb7eec769c192eea2a0674e08a8b2f 1492443381 2017-04-17T15:36:21+00:00
+3e5b29b4a7d35ae0a14e3628ef705868688f2c1d 1520927574 2018-03-13T07:52:54+00:00
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 215602afd22e..b6ba86246c9d 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-201803-04.xml b/metadata/glsa/glsa-201803-04.xml
new file mode 100644
index 000000000000..fbb8dc4ac337
--- /dev/null
+++ b/metadata/glsa/glsa-201803-04.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201803-04">
+  <title>Newsbeuter: User-assisted execution of arbitrary code</title>
+  <synopsis>A vulnerability in Newsbeuter may allow remote attackers to execute
+    arbitrary shell commands.
+  </synopsis>
+  <product type="ebuild">newsbeuter</product>
+  <announced>2018-03-11</announced>
+  <revised count="1">2018-03-11</revised>
+  <bug>631150</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-news/newsbeuter" auto="yes" arch="*">
+      <vulnerable range="le">2.9-r3</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Newsbeuter is a RSS/Atom feed reader for the text console.</p>
+    
+  </background>
+  <description>
+    <p>Newsbeuter does not properly escape shell meta-characters in an RSS item
+      with a media enclosure in the podcast playback function of Podbeuter.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker, by enticing a user to open a feed with a specially
+      crafted media enclosure, could possibly execute arbitrary shell commands
+      with the privileges of the user running the application.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>Gentoo has discontinued support for Newsbeuter and recommends that users
+      unmerge the package:
+    </p>
+    
+    <code>
+      # emerge --unmerge "net-news/newsbeuter"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-14500">CVE-2017-14500</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-02-05T14:58:55Z">chrisadr</metadata>
+  <metadata tag="submitter" timestamp="2018-03-11T16:29:05Z">chrisadr</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c3a442fef94a..19aef3166834 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Mar 2018 12:38:29 +0000
+Tue, 13 Mar 2018 19:38:12 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 5f1f6b8c86ad..ae3297387e20 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-de3c19ca944a942c4db36136bf5abc8983cd6a6c 1520449520 2018-03-07T19:05:20+00:00
+a3a9d59f86ebf5d6e6d86f34addc40bfcfe72e5a 1520785907 2018-03-11T16:31:47+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ccdde36f8fc6..a6b402a924eb 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 67934195f654..e93e51718ef9 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8 b/metadata/md5-cache/app-admin/conky-1.10.8
index a082c89f9c33..41a299a2995e 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8
+++ b/metadata/md5-cache/app-admin/conky-1.10.8
@@ -10,4 +10,4 @@ RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f15906295d1f7726ec9f67f344010b30
+_md5_=9d4f937f9133fbcd4588520e7d65986c
diff --git a/metadata/md5-cache/app-admin/glance-15.0.0 b/metadata/md5-cache/app-admin/glance-15.0.0
deleted file mode 100644
index 7d9bc704ec16..000000000000
--- a/metadata/md5-cache/app-admin/glance-15.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup 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-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/pbr-2.1.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_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=Services for discovering, registering, and retrieving VM images
-EAPI=6
-HOMEPAGE=https://launchpad.net/glance
-IUSE=doc mysql postgres +sqlite +swift python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=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(-)] !~dev-python/pbr-2.1.0 sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.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/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[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/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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/sqlalchemy-1.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(-)] ) postgres? ( >=dev-python/psycopg-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/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[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/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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/sqlalchemy-1.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/eventlet-0.18.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/eventlet-0.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/eventlet-0.21.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/pastedeploy-1.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/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-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/sqlalchemy-migrate-0.11.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-sqlparse-0.2.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/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.7.5[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-config-4.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/oslo-config-4.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/oslo-config-4.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/oslo-concurrency-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/oslo-context-2.14.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.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/stevedore-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/futurist-0.11.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/futurist-0.15.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/taskflow-2.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/keystoneauth-3.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/keystonemiddleware-4.12.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/WSME-0.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/prettytable-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/prettytable-0.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/paste[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/jsonschema-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/jsonschema-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/jsonschema-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/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/pyopenssl-0.14[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/oslo-db-4.24.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-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-i18n-3.15.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/oslo-log-3.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-messaging-5.24.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/oslo-messaging-5.25.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-middleware-3.27.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-policy-1.23.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/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/retrying-1.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/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/glance_store-0.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/debtcollector-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/cryptography-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(-)] !~dev-python/cryptography-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/cursive-0.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/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/monotonic-0.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(-)] 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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/glance/glance-15.0.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a4d27b2cb5da9917d81ada3a6d2c1788
diff --git a/metadata/md5-cache/app-admin/glance-15.0.1 b/metadata/md5-cache/app-admin/glance-15.0.1
index 39408dfff9da..d91597689b68 100644
--- a/metadata/md5-cache/app-admin/glance-15.0.1
+++ b/metadata/md5-cache/app-admin/glance-15.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Services for discovering, registering, and retrieving VM images
 EAPI=6
 HOMEPAGE=https://launchpad.net/glance
 IUSE=doc mysql postgres +sqlite +swift python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=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(-)] !~dev-python/pbr-2.1.0 sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.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/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[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/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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/sqlalchemy-1.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(-)] ) postgres? ( >=dev-python/psycopg-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/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[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/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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/sqlalchemy-1.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/eventlet-0.18.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/eventlet-0.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/eventlet-0.21.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/pastedeploy-1.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/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-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/sqlalchemy-migrate-0.11.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-sqlparse-0.2.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/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.7.5[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-config-4.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/oslo-config-4.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/oslo-config-4.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/oslo-concurrency-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/oslo-context-2.14.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.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/stevedore-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/futurist-0.11.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/futurist-0.15.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/taskflow-2.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/keystoneauth-3.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/keystonemiddleware-4.12.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/WSME-0.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/prettytable-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/prettytable-0.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/paste[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/jsonschema-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/jsonschema-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/jsonschema-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/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/pyopenssl-0.14[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/oslo-db-4.24.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-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-i18n-3.15.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/oslo-log-3.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-messaging-5.24.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/oslo-messaging-5.25.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-middleware-3.27.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-policy-1.23.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/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/retrying-1.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/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/glance_store-0.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/debtcollector-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/cryptography-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(-)] !~dev-python/cryptography-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/cursive-0.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/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/monotonic-0.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(-)] 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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-15.0.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=715f463cfe466816c9c03619228f9a97
+_md5_=4a3683e15449336fad88022f61587dea
diff --git a/metadata/md5-cache/app-admin/logstash-bin-5.6.5 b/metadata/md5-cache/app-admin/logstash-bin-5.6.8
similarity index 95%
rename from metadata/md5-cache/app-admin/logstash-bin-5.6.5
rename to metadata/md5-cache/app-admin/logstash-bin-5.6.8
index 0727e3870a0c..f8e5bff62607 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-5.6.5
+++ b/metadata/md5-cache/app-admin/logstash-bin-5.6.8
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0 MIT
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/logstash/logstash-5.6.5.zip
+SRC_URI=https://artifacts.elastic.co/downloads/logstash/logstash-5.6.8.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a62ab8d293f468bbf68a68395ed46007
+_md5_=37c954e2f662b458b83bfb4766fa8129
diff --git a/metadata/md5-cache/app-admin/logstash-bin-6.2.2 b/metadata/md5-cache/app-admin/logstash-bin-6.2.2
new file mode 100644
index 000000000000..5ae074a46a82
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logstash-bin-6.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Tool for managing events and logs
+EAPI=6
+HOMEPAGE=https://www.elastic.co/products/logstash
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT
+RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://artifacts.elastic.co/downloads/logstash/logstash-6.2.2.zip
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=697007ae9d0338212841bb0c74f9bc9e
diff --git a/metadata/md5-cache/app-admin/puppet-5.4.0-r1 b/metadata/md5-cache/app-admin/puppet-5.4.0-r1
index d75ca46a4331..50feeb80fb1a 100644
--- a/metadata/md5-cache/app-admin/puppet-5.4.0-r1
+++ b/metadata/md5-cache/app-admin/puppet-5.4.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A system automation and configuration management software.
 EAPI=6
 HOMEPAGE=http://puppetlabs.com/
 IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
 RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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] )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.4.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=336223d21207d4248a1037000616b56b
+_md5_=61633213af93fdd311a6d6a935b925c4
diff --git a/metadata/md5-cache/app-admin/sshguard-2.1.0-r1 b/metadata/md5-cache/app-admin/sshguard-2.1.0-r1
index fa9f0d388d96..371964d26f8a 100644
--- a/metadata/md5-cache/app-admin/sshguard-2.1.0-r1
+++ b/metadata/md5-cache/app-admin/sshguard-2.1.0-r1
@@ -3,9 +3,9 @@ DEPEND=sys-devel/flex
 DESCRIPTION=protects hosts from brute force attacks against ssh
 EAPI=6
 HOMEPAGE=http://sshguard.sourceforge.net/
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/sshguard/sshguard-2.1.0.tar.gz
-_md5_=1fca035edf5e023da61f260d6a3bf08f
+_md5_=95e72b6fc199494d817fc99950a12db3
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index c5d30bc5cabf..f0e33ee82288 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/dpkg-1.19.0.5 b/metadata/md5-cache/app-arch/dpkg-1.19.0.5
index 5f770b918cfe..4bb09cc54379 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.19.0.5
+++ b/metadata/md5-cache/app-arch/dpkg-1.19.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=6
 HOMEPAGE=https://packages.qa.debian.org/dpkg
 IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.19.0.5.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f08fe51a118511ef300bb72258791c96
+_md5_=0aaf5326498277d4dd689bd2a9a051f4
diff --git a/metadata/md5-cache/app-arch/p7zip-16.02-r2 b/metadata/md5-cache/app-arch/p7zip-16.02-r2
index 2a9b010adaa1..ae4e90675316 100644
--- a/metadata/md5-cache/app-arch/p7zip-16.02-r2
+++ b/metadata/md5-cache/app-arch/p7zip-16.02-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Port of 7-Zip archiver for Unix
 EAPI=6
 HOMEPAGE=http://p7zip.sourceforge.net/
 IUSE=abi_x86_x32 doc kde +pch rar static wxwidgets
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=LGPL-2.1 rar? ( unRAR )
 RDEPEND=wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 REQUIRED_USE=kde? ( wxwidgets )
 SLOT=0
 SRC_URI=mirror://sourceforge/p7zip/p7zip_16.02_src_all.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=9542f401fbdd04050dac738ed5992047
+_md5_=e1e7f5c379a9cbf037cccd56d148a983
diff --git a/metadata/md5-cache/app-arch/rar-5.6.0_beta1_p20180311 b/metadata/md5-cache/app-arch/rar-5.6.0_beta1_p20180311
new file mode 100644
index 000000000000..499260f73012
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rar-5.6.0_beta1_p20180311
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=all_sfx? ( app-arch/unrar )
+DESCRIPTION=RAR compressor/uncompressor
+EAPI=6
+HOMEPAGE=http://www.rarsoft.com/
+IUSE=all_sfx
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=RAR BSD BSD-2
+RDEPEND=sys-libs/glibc
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=x86? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.6.0_beta1_p20180311.tar.gz ) amd64? ( https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.6.0_beta1_p20180311.tar.gz ) all_sfx? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.6.0_beta1_p20180311.tar.gz https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.6.0_beta1_p20180311.tar.gz https://mirror.whissi.de/distfiles/rar/winrar-x64-5.6.0_beta1_p20180311.exe )
+_md5_=f5d13154e2023af11f1ecab75240fb21
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.1 b/metadata/md5-cache/app-arch/unrar-5.6.1
new file mode 100644
index 000000000000..67e0c680ec9d
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-5.6.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=6
+HOMEPAGE=http://www.rarlab.com/rar_add.htm
+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=unRAR
+RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
+SLOT=0/5
+SRC_URI=http://www.rarlab.com/rar/unrarsrc-5.6.1.tar.gz -> unrar-5.6.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=95a104a41cb0d7ae5e3320cc8c4fd609
diff --git a/metadata/md5-cache/app-arch/xar-1.8-r1 b/metadata/md5-cache/app-arch/xar-1.8-r1
new file mode 100644
index 000000000000..d3543a2b2e32
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xar-1.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=!kernel_Darwin? ( virtual/acl !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(-)?] ) ) 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(-)?] 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(-)?] 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(-)?]
+DESCRIPTION=An easily extensible archive format
+EAPI=6
+HOMEPAGE=https://opensource.apple.com/source/xar/
+IUSE=libressl kernel_Darwin abi_x86_32 abi_x86_64 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 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=!kernel_Darwin? ( virtual/acl !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(-)?] ) ) 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(-)?] 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(-)?] 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(-)?]
+SLOT=0
+SRC_URI=https://opensource.apple.com/tarballs/xar/xar-400.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1eb6f62e6dbc9af0d65e9387056db034
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index ed7f0c641809..5d9ada1b2d38 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/moolticute-0.11.6_beta b/metadata/md5-cache/app-crypt/moolticute-0.11.11_beta
similarity index 91%
rename from metadata/md5-cache/app-crypt/moolticute-0.11.6_beta
rename to metadata/md5-cache/app-crypt/moolticute-0.11.11_beta
index 26429e11956a..78a078bb0ba4 100644
--- a/metadata/md5-cache/app-crypt/moolticute-0.11.6_beta
+++ b/metadata/md5-cache/app-crypt/moolticute-0.11.11_beta
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/libusb-1.0.20 >=dev-qt/qtcore-5.6:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
 SLOT=0
-SRC_URI=https://github.com/mooltipass/moolticute/archive/v0.11.6-beta.tar.gz -> moolticute-0.11.6_beta.tar.gz
+SRC_URI=https://github.com/mooltipass/moolticute/archive/v0.11.11-beta.tar.gz -> moolticute-0.11.11_beta.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4e9ce8403a081e97fee544d363655a9e
diff --git a/metadata/md5-cache/app-crypt/ophcrack-3.6.0 b/metadata/md5-cache/app-crypt/ophcrack-3.6.0
index 511c826601d8..668ae1d665ac 100644
--- a/metadata/md5-cache/app-crypt/ophcrack-3.6.0
+++ b/metadata/md5-cache/app-crypt/ophcrack-3.6.0
@@ -3,11 +3,11 @@ DEPEND=app-arch/unzip virtual/pkgconfig !libressl? ( dev-libs/openssl:0= ) libre
 DESCRIPTION=A time-memory-trade-off-cracker
 EAPI=6
 HOMEPAGE=http://ophcrack.sourceforge.net/
-IUSE=debug libressl qt4 +tables
+IUSE=debug libressl +tables
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=tables? ( app-crypt/ophcrack-tables ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib
 SLOT=0
 SRC_URI=mirror://sourceforge/ophcrack/ophcrack-3.6.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ef17a6397c0d1c797daec4a6f83b024e
+_md5_=5cb0fdf5461723e7fdef34aaebaf2634
diff --git a/metadata/md5-cache/app-crypt/ophcrack-3.7.0 b/metadata/md5-cache/app-crypt/ophcrack-3.7.0
index 2512ad5ff4a6..6384b279240c 100644
--- a/metadata/md5-cache/app-crypt/ophcrack-3.7.0
+++ b/metadata/md5-cache/app-crypt/ophcrack-3.7.0
@@ -3,11 +3,11 @@ DEPEND=app-arch/unzip virtual/pkgconfig !libressl? ( dev-libs/openssl:0= ) libre
 DESCRIPTION=A time-memory-trade-off-cracker
 EAPI=6
 HOMEPAGE=http://ophcrack.sourceforge.net/
-IUSE=debug libressl qt4 +tables
+IUSE=debug libressl +tables
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=tables? ( app-crypt/ophcrack-tables ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib
 SLOT=0
 SRC_URI=mirror://sourceforge/ophcrack/ophcrack-3.7.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c74ddce84adccd64f4d41bf447ef6dad
+_md5_=d1fbd48233725aee771ce19efb1ea0df
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 9395a8e271ce..88095e71ef49 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/mousepad-0.4.0 b/metadata/md5-cache/app-editors/mousepad-0.4.0
deleted file mode 100644
index 837faed678bf..000000000000
--- a/metadata/md5-cache/app-editors/mousepad-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= ) dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/start
-IUSE=debug dbus gtk3
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/mousepad/0.4/mousepad-0.4.0.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=6306b351632b080c52e8b5caac2e84d5
diff --git a/metadata/md5-cache/app-editors/mousepad-0.4.0-r1 b/metadata/md5-cache/app-editors/mousepad-0.4.0-r1
index 2c0ea53b35f1..bbed296edbfa 100644
--- a/metadata/md5-cache/app-editors/mousepad-0.4.0-r1
+++ b/metadata/md5-cache/app-editors/mousepad-0.4.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure postinst postrm
 DEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= ) dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
 DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
 EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/start
+HOMEPAGE=https://git.xfce.org/apps/mousepad/about/
 IUSE=dbus gtk3
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? (
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/mousepad/0.4/mousepad-0.4.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd0f78ba0a9a9318a21a774c311ad4a0
+_md5_=65cb0578f78a077514e7434d90bc1430
diff --git a/metadata/md5-cache/app-editors/nedit-5.6-r2 b/metadata/md5-cache/app-editors/nedit-5.6-r2
new file mode 100644
index 000000000000..59a01c333119
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nedit-5.6-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 || ( dev-util/yacc sys-devel/bison ) dev-lang/perl
+DESCRIPTION=Multi-purpose text editor for the X Window System
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/nedit
+KEYWORDS=~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/nedit/nedit-source/nedit-5.6a-src.tar.gz https://dev.gentoo.org/~jlec/distfiles/nedit.png.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=50039ef51e363c9008a824556e31c0f3
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 03635f39313f..fc2586686a21 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/xen-4.10.0 b/metadata/md5-cache/app-emulation/xen-4.10.0
new file mode 100644
index 000000000000..aa3835e1e519
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.10.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=6
+HOMEPAGE=https://www.xenproject.org
+IUSE=custom-cflags debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.10.0
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.10.0/xen-4.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.10.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.10.0-upstream-patches-0.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f3d1b4254814525ae78d2dad6a1e8c27
diff --git a/metadata/md5-cache/app-emulation/xen-4.9.1-r2 b/metadata/md5-cache/app-emulation/xen-4.9.1-r2
new file mode 100644
index 000000000000..7d22140a7f7f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.9.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=6
+HOMEPAGE=https://www.xenproject.org
+IUSE=custom-cflags debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.9.1
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.9.1/xen-4.9.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.9.1-upstream-patches-2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d511ccef41ec766c566a67e77040386d
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.10.0 b/metadata/md5-cache/app-emulation/xen-tools-4.10.0
new file mode 100644
index 000000000000..d683aa9c483f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.10.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,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-kernel/linux-headers-4.11 dev-python/lxml[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(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[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(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[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-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=6
+HOMEPAGE=https://www.xenproject.org
+IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,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-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.10
+SRC_URI=https://downloads.xenproject.org/release/xen/4.10.0/xen-4.10.0.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.10.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.10.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-12.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-12.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=a2dfba2bbc75640ad411bcf237ca3947
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r2
new file mode 100644
index 000000000000..74b298b12816
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,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-kernel/linux-headers-4.11 dev-python/lxml[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(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[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(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[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-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=6
+HOMEPAGE=https://www.xenproject.org
+IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,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-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.9
+SRC_URI=https://downloads.xenproject.org/release/xen/4.9.1/xen-4.9.1.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.9.1-upstream-patches-2.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-12.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-12.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=cb5a3394c902d00fe6e513dcd0a95f68
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index c60717f04d4f..b32e2b370233 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2 b/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
index 9d45625dd85c..73ebe408498a 100644
--- a/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
+++ b/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
@@ -4,9 +4,9 @@ DESCRIPTION=An encoding detector library
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/uchardet/
 IUSE=cpu_flags_x86_sse2 static-libs test
-KEYWORDS=alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 ~sparc x86
 LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1e8d4f95a6bb648467d6329e23128787
+_md5_=8c504a8615b52564f9a942e6021627b7
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 10a3fb113682..1b4a902d1028 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.2-r2 b/metadata/md5-cache/app-misc/pax-utils-1.2.2-r2
index 6b0e7afb596b..dc367026a25b 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.2-r2
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=ELF utils that can check files for security relevant properties
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
 IUSE=caps debug python seccomp
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( dev-python/pyelftools ) seccomp? ( sys-libs/libseccomp )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.2.2.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.2.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f91bce981270483996668ab71db6730
+_md5_=15f3e7599fc4eed88eaa14ffcda1e49a
diff --git a/metadata/md5-cache/app-misc/pdfpc-3.1.1 b/metadata/md5-cache/app-misc/pdfpc-3.1.1
index ec49f077a1fc..bf403d969562 100644
--- a/metadata/md5-cache/app-misc/pdfpc-3.1.1
+++ b/metadata/md5-cache/app-misc/pdfpc-3.1.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/libgee:0 gnome-base/librsvg x11-libs/gtk+:2 sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0 gnome-base/librsvg x11-libs/gtk+:2 sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Presenter console with multi-monitor support for PDF files
 EAPI=5
 HOMEPAGE=https://davvil.github.com/pdfpc/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/libgee:0 gnome-base/librsvg x11-libs/gtk+:2
+RDEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0 gnome-base/librsvg x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://github/davvil/pdfpc/pdfpc-3.1.1.tgz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a0ff9ea7fafb1cd809eb9d179da3cd2
+_md5_=b6563acd4c246b9a1e9df3bc354060d3
diff --git a/metadata/md5-cache/app-misc/pdfpc-4.0.7 b/metadata/md5-cache/app-misc/pdfpc-4.0.7
index 0e0e91156ba9..4c40a52c6e65 100644
--- a/metadata/md5-cache/app-misc/pdfpc-4.0.7
+++ b/metadata/md5-cache/app-misc/pdfpc-4.0.7
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Presenter console with multi-monitor support for PDF files
 EAPI=6
 HOMEPAGE=http://pdfpc.github.io
 IUSE=gstreamer
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3
+RDEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/pdfpc/pdfpc/archive/v4.0.7.tar.gz -> pdfpc-4.0.7.tar.gz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=73a8d811b1f6f6994ccec7653b447683
+_md5_=eef15a6b917c4533711f49fd21ceac43
diff --git a/metadata/md5-cache/app-misc/pdfpc-4.0.8 b/metadata/md5-cache/app-misc/pdfpc-4.0.8
index a7505864c625..256cb0cbe40f 100644
--- a/metadata/md5-cache/app-misc/pdfpc-4.0.8
+++ b/metadata/md5-cache/app-misc/pdfpc-4.0.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Presenter console with multi-monitor support for PDF files
 EAPI=6
 HOMEPAGE=http://pdfpc.github.io
 IUSE=gstreamer
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3
+RDEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/pdfpc/pdfpc/archive/v4.0.8.tar.gz -> pdfpc-4.0.8.tar.gz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=73a8d811b1f6f6994ccec7653b447683
+_md5_=eef15a6b917c4533711f49fd21ceac43
diff --git a/metadata/md5-cache/app-misc/timew-1.1.1 b/metadata/md5-cache/app-misc/timew-1.1.1
new file mode 100644
index 000000000000..459f278870d9
--- /dev/null
+++ b/metadata/md5-cache/app-misc/timew-1.1.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Tracks your time from the command line, and generates reports
+EAPI=6
+HOMEPAGE=https://taskwarrior.org/news/news.20160821.html
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://taskwarrior.org/download/timew-1.1.1.tar.gz
+_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7c49fedf27184405d2c7aa382eb238e8
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 833475ced54d..6ea87d05fb74 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/calligra-3.0.1 b/metadata/md5-cache/app-office/calligra-3.0.1
index 3ccbdea6ac98..399c88daef17 100644
--- a/metadata/md5-cache/app-office/calligra-3.0.1
+++ b/metadata/md5-cache/app-office/calligra-3.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_braindump? ( >=dev-qt/qtwebkit-5.7.1:5 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-14.12.0:5 ) ) calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=dev-qt/qtcore-5.7.1:5= dev-libs/kdiagram:5 =dev-libs/kproperty-3.0*:5 =dev-libs/kreport-3.0*:5 pim? ( >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-14.12.0:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.40.0:5 ) 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.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.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
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_braindump? ( >=dev-qt/qtwebkit-5.7.1:5 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-14.12.0:5 ) ) calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=dev-qt/qtcore-5.7.1:5= dev-libs/kdiagram:5 =dev-libs/kproperty-3.0*:5 =dev-libs/kreport-3.0*:5 pim? ( >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-14.12.0:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.40.0:5 ) 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.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.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 Office Suite
 EAPI=6
 HOMEPAGE=https://www.calligra.org/
 IUSE=activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular openexr +pdf phonon pim spacenav +truetype X calligra_features_karbon calligra_features_plan calligra_features_sheets calligra_features_words calligra_experimental_features_braindump calligra_experimental_features_stage debug +handbook test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_braindump? ( >=dev-qt/qtwebkit-5.7.1:5 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-14.12.0:5 ) ) calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=dev-qt/qtcore-5.7.1:5= dev-libs/kdiagram:5 =dev-libs/kproperty-3.0*:5 =dev-libs/kreport-3.0*:5 pim? ( >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-14.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_braindump? ( >=dev-qt/qtwebkit-5.7.1:5 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-14.12.0:5 ) ) calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=dev-qt/qtcore-5.7.1:5= dev-libs/kdiagram:5 =dev-libs/kproperty-3.0*:5 =dev-libs/kreport-3.0*:5 pim? ( >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-14.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.0.1/calligra-3.0.1.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45c732c36b0d8571a00b8370f8f0b5a7
+_md5_=39330f99676bbc81e6557715e2731e69
diff --git a/metadata/md5-cache/app-office/calligra-3.1.0-r1 b/metadata/md5-cache/app-office/calligra-3.1.0-r1
index 5d4fc27a4d3b..e5a1c3c7c05d 100644
--- a/metadata/md5-cache/app-office/calligra-3.1.0-r1
+++ b/metadata/md5-cache/app-office/calligra-3.1.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kholidays-5.40.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.40.0:5 ) 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.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.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
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kholidays-5.40.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.40.0:5 ) 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.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.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 Office Suite
 EAPI=6
 HOMEPAGE=https://www.calligra.org/
 IUSE=activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf phonon pim spacenav +truetype X calligra_features_karbon calligra_features_plan calligra_features_sheets calligra_features_words calligra_experimental_features_stage debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kholidays-5.40.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kholidays-5.40.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.1.0/calligra-3.1.0.tar.xz calligra_features_plan? ( mirror://kde/stable/calligra/3.1.0/calligraplan-3.1.0.tar.xz )
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1284666b9482b053cf8707038c93a620
+_md5_=df237c4e5b5cf71a21b60dee8c887ac6
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.0 b/metadata/md5-cache/app-office/kmymoney-5.0.0-r1
similarity index 52%
rename from metadata/md5-cache/app-office/kmymoney-5.0.0
rename to metadata/md5-cache/app-office/kmymoney-5.0.0-r1
index 8ed5e8db60bc..b60936e1f38b 100644
--- a/metadata/md5-cache/app-office/kmymoney-5.0.0
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) addressbook? ( >=kde-apps/akonadi-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kidentitymanagement-14.12.0:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.6.5 >=sys-libs/gwenhywfar-4.15.3-r1[qt5] ) holidays? ( || ( >=kde-frameworks/kholidays-5.40.0:5 >=kde-apps/kholidays-14.12.0:5 ) ) ofx? ( dev-libs/libofx ) weboob? ( >=kde-frameworks/kross-5.40.0:5 www-client/weboob ) dev-libs/boost virtual/pkgconfig 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.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.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
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) addressbook? ( >=kde-apps/akonadi-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kidentitymanagement-14.12.0:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.6.5 >=sys-libs/gwenhywfar-4.15.3-r1[qt5] ) holidays? ( || ( >=kde-frameworks/kholidays-5.40.0:5 >=kde-apps/kholidays-14.12.0:5 ) ) ofx? ( dev-libs/libofx ) weboob? ( >=kde-frameworks/kross-5.40.0:5 www-client/weboob ) dev-libs/boost virtual/pkgconfig 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.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.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=Personal finance manager based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://kmymoney.org
 IUSE=activities addressbook calendar hbci holidays ofx quotes weboob test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) addressbook? ( >=kde-apps/akonadi-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kidentitymanagement-14.12.0:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.6.5 >=sys-libs/gwenhywfar-4.15.3-r1[qt5] ) holidays? ( || ( >=kde-frameworks/kholidays-5.40.0:5 >=kde-apps/kholidays-14.12.0:5 ) ) ofx? ( dev-libs/libofx ) weboob? ( >=kde-frameworks/kross-5.40.0:5 www-client/weboob ) !app-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) addressbook? ( >=kde-apps/akonadi-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kidentitymanagement-14.12.0:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.6.5 >=sys-libs/gwenhywfar-4.15.3-r1[qt5] ) holidays? ( || ( >=kde-frameworks/kholidays-5.40.0:5 >=kde-apps/kholidays-14.12.0:5 ) ) ofx? ( dev-libs/libofx ) weboob? ( >=kde-frameworks/kross-5.40.0:5 www-client/weboob ) !app-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmymoney/5.0.0/src/kmymoney-5.0.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0a109bac23f25152973934ba206d9173
+_md5_=6f127b41a6db0856f79fbeb058ddadd8
diff --git a/metadata/md5-cache/app-office/scribus-1.5.3-r1 b/metadata/md5-cache/app-office/scribus-1.5.3-r1
index abf861627a0b..38b41aa68813 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.3-r1
+++ b/metadata/md5-cache/app-office/scribus-1.5.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=6
 HOMEPAGE=https://www.scribus.net/
 IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk l10n_af l10n_ar l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_de-CH l10n_de-DE l10n_el l10n_en-AU l10n_en-GB l10n_en-US l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_kab l10n_kn l10n_ko l10n_ku l10n_la l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sa l10n_sk l10n_sl l10n_so l10n_sq l10n_sr l10n_sv l10n_te l10n_th l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW python_targets_python2_7
-KEYWORDS=amd64 ~hppa ppc ~ppc64 x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,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(+)] ) tk? ( dev-python/pillow[tk?,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-text/ghostscript-gpl
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.3/scribus-1.5.3.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a06da8400a47d924816a60eac36a20b6
+_md5_=eb000de4cc91aa006faccece5ea7b66c
diff --git a/metadata/md5-cache/app-office/texmaker-4.5-r2 b/metadata/md5-cache/app-office/texmaker-4.5-r2
index aca59d9a73e3..202b75983138 100644
--- a/metadata/md5-cache/app-office/texmaker-4.5-r2
+++ b/metadata/md5-cache/app-office/texmaker-4.5-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler:=[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig
+DEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig
 DESCRIPTION=A nice LaTeX-IDE
 EAPI=5
 HOMEPAGE=http://www.xm1math.net/texmaker/
 KEYWORDS=amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler:=[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
+RDEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=http://www.xm1math.net/texmaker/texmaker-4.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=83aa96e4ce4b9aad959a9ad95c3f6304
+_md5_=172c866a89531139c3f5cc1ae9bda68d
diff --git a/metadata/md5-cache/app-office/texmaker-4.5-r3 b/metadata/md5-cache/app-office/texmaker-4.5-r3
index 7b4e68b61983..8ad02cb02a37 100644
--- a/metadata/md5-cache/app-office/texmaker-4.5-r3
+++ b/metadata/md5-cache/app-office/texmaker-4.5-r3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler:=[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig
+DEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig
 DESCRIPTION=A nice LaTeX-IDE
 EAPI=5
 HOMEPAGE=http://www.xm1math.net/texmaker/
 KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler:=[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
+RDEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=http://www.xm1math.net/texmaker/texmaker-4.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8351a58e0595d05d10b766bd043fd0d0
+_md5_=d2f6ff72f001662adc513328011978ae
diff --git a/metadata/md5-cache/app-office/texmaker-5.0-r1 b/metadata/md5-cache/app-office/texmaker-5.0-r1
index 31fa30de6efa..184858b1c406 100644
--- a/metadata/md5-cache/app-office/texmaker-5.0-r1
+++ b/metadata/md5-cache/app-office/texmaker-5.0-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler:=[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig
+DEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig
 DESCRIPTION=A nice LaTeX-IDE
 EAPI=6
 HOMEPAGE=http://www.xm1math.net/texmaker/
 KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler:=[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
+RDEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=http://www.xm1math.net/texmaker/texmaker-5.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=37f306f94c0f604a8cac129c52023268
+_md5_=0a1c3b057c0dee3ce8f443167db41318
diff --git a/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r1 b/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r1
deleted file mode 100644
index 4905e08b3fd6..000000000000
--- a/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=WPS Office is an office productivity suite
-EAPI=6
-HOMEPAGE=http://linux.wps.cn/ http://wps-community.org/
-IUSE=+sharedfonts X
-KEYWORDS=~amd64 ~x86
-LICENSE=WPS-EULA
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb sys-devel/gcc sys-libs/glibc media-libs/fontconfig:1.0 media-libs/freetype:2 dev-libs/glib:2 sys-libs/zlib:0 net-print/cups media-libs/libpng:1.2 virtual/glu dev-libs/libpcre:3 dev-libs/libffi media-sound/pulseaudio app-arch/bzip2:0 media-libs/libpng:0 dev-libs/expat sys-apps/util-linux dev-libs/libbsd x11-libs/libXau x11-libs/libXdmcp sys-apps/dbus x11-libs/libXtst sys-apps/systemd sys-apps/tcp-wrappers media-libs/libsndfile net-libs/libasyncns dev-libs/libgcrypt:0 app-arch/xz-utils app-arch/lz4 sys-libs/libcap media-libs/flac media-libs/libogg media-libs/libvorbis dev-libs/libgpg-error sys-apps/attr
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=x86? ( http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5707~a21_i386.deb ) amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5707~a21_amd64.deb )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2628b0ab5c7ad99f15c25040f805caff
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 0e445d44f914..f6a611702a3a 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/gemato-10.3-r1 b/metadata/md5-cache/app-portage/gemato-10.3-r1
deleted file mode 100644
index 945269135678..000000000000
--- a/metadata/md5-cache/app-portage/gemato-10.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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? ( blake2? ( python_targets_pypy? ( dev-python/pyblake2[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_python2_7? ( dev-python/pyblake2[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_4? ( dev-python/pyblake2[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_5? ( dev-python/pyblake2[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(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[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_python2_7? ( dev-python/pysha3[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_4? ( dev-python/pysha3[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_5? ( dev-python/pysha3[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_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(-)]
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+blake2 bzip2 +gpg lzma sha3 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD-2
-RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[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_python2_7? ( dev-python/pyblake2[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_4? ( dev-python/pyblake2[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_5? ( dev-python/pyblake2[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(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[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_python2_7? ( dev-python/pysha3[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_4? ( dev-python/pysha3[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_5? ( dev-python/pysha3[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(-)] ) ) 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 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gemato/gemato-10.3.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4ca4fd5d05985fc7bd658dbb31c32579
diff --git a/metadata/md5-cache/app-portage/gemato-11.0 b/metadata/md5-cache/app-portage/gemato-11.0
deleted file mode 100644
index c5f03bf685e5..000000000000
--- a/metadata/md5-cache/app-portage/gemato-11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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? ( blake2? ( python_targets_pypy? ( dev-python/pyblake2[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_python2_7? ( dev-python/pyblake2[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_4? ( dev-python/pyblake2[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_5? ( dev-python/pyblake2[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(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[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_python2_7? ( dev-python/pysha3[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_4? ( dev-python/pysha3[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_5? ( dev-python/pysha3[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_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(-)]
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+blake2 bzip2 +gpg lzma sha3 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD-2
-RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[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_python2_7? ( dev-python/pyblake2[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_4? ( dev-python/pyblake2[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_5? ( dev-python/pyblake2[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(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[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_python2_7? ( dev-python/pysha3[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_4? ( dev-python/pysha3[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_5? ( dev-python/pysha3[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(-)] ) ) 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 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gemato/gemato-11.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4ca4fd5d05985fc7bd658dbb31c32579
diff --git a/metadata/md5-cache/app-portage/gemato-11.1 b/metadata/md5-cache/app-portage/gemato-12.0
similarity index 97%
rename from metadata/md5-cache/app-portage/gemato-11.1
rename to metadata/md5-cache/app-portage/gemato-12.0
index a5ed67c07908..8da58d19711d 100644
--- a/metadata/md5-cache/app-portage/gemato-11.1
+++ b/metadata/md5-cache/app-portage/gemato-12.0
@@ -4,11 +4,11 @@ DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/gemato
 IUSE=+blake2 bzip2 +gpg lzma sha3 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
 LICENSE=BSD-2
 RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[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_python2_7? ( dev-python/pyblake2[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_4? ( dev-python/pyblake2[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_5? ( dev-python/pyblake2[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(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[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_python2_7? ( dev-python/pysha3[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_4? ( dev-python/pysha3[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_5? ( dev-python/pysha3[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(-)] ) ) 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 )
 SLOT=0
-SRC_URI=mirror://pypi/g/gemato/gemato-11.1.tar.gz
+SRC_URI=mirror://pypi/g/gemato/gemato-12.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4ca4fd5d05985fc7bd658dbb31c32579
+_md5_=b83f983ffadd9716af99150555e85665
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index c4c5b8ec5a91..54f644f41504 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.7-r3 b/metadata/md5-cache/app-shells/bash-completion-2.7-r3
new file mode 100644
index 000000000000..287b5e56b507
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-completion-2.7-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prepare test
+DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib )
+DESCRIPTION=Programmable Completion for bash
+EAPI=6
+HOMEPAGE=https://github.com/scop/bash-completion
+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 ~sparc64-solaris
+LICENSE=GPL-2
+PDEPEND=>=app-shells/gentoo-bashcomp-20140911
+RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/scop/bash-completion/releases/download/2.7/bash-completion-2.7.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c4436426c8d468dd3b5f5f605df4521b
diff --git a/metadata/md5-cache/app-shells/bash-completion-9999 b/metadata/md5-cache/app-shells/bash-completion-9999
index a8508767f4ef..42def47c9e9c 100644
--- a/metadata/md5-cache/app-shells/bash-completion-9999
+++ b/metadata/md5-cache/app-shells/bash-completion-9999
@@ -10,4 +10,4 @@ RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bas
 SLOT=0
 SRC_URI=https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6af3d652bfbd977fce9cfa16088a50af
+_md5_=98848e38a750cd95627cb7723b24b2f3
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 4b41430518d1..aba7c0bf86bd 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/apvlv-0.1.5-r1 b/metadata/md5-cache/app-text/apvlv-0.1.5-r1
index 3aaf4390d752..38cf9447be7d 100644
--- a/metadata/md5-cache/app-text/apvlv-0.1.5-r1
+++ b/metadata/md5-cache/app-text/apvlv-0.1.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=Alf's PDF Viewer Like Vim
 EAPI=5
 HOMEPAGE=https://naihe2010.github.com/apvlv/
 IUSE=debug djvu
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= )
+RDEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= )
 SLOT=0
 SRC_URI=https://github.com/naihe2010/apvlv/archive/v0.1.5.tar.gz -> apvlv-0.1.5.tar.gz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d54413722f05feb4d5c1651ec777cc12
+_md5_=7830b84df3ab289252cbea646fbddcf7
diff --git a/metadata/md5-cache/app-text/apvlv-0.1.5-r2 b/metadata/md5-cache/app-text/apvlv-0.1.5-r2
index d6ff7c6b00e6..cb18a24ed722 100644
--- a/metadata/md5-cache/app-text/apvlv-0.1.5-r2
+++ b/metadata/md5-cache/app-text/apvlv-0.1.5-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=Alf's PDF Viewer Like Vim
 EAPI=5
 HOMEPAGE=https://naihe2010.github.com/apvlv/
 IUSE=debug djvu
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= )
+RDEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= )
 SLOT=0
 SRC_URI=https://github.com/naihe2010/apvlv/archive/v0.1.5.tar.gz -> apvlv-0.1.5.tar.gz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19f12377a250ecff9d037c0b9f28902d
+_md5_=297b30c66f45312579aa559f4bb5958b
diff --git a/metadata/md5-cache/app-text/atril-1.12.2-r5 b/metadata/md5-cache/app-text/atril-1.12.2-r5
index ccb751155b4c..2148b8fbf0a0 100644
--- a/metadata/md5-cache/app-text/atril-1.12.2-r5
+++ b/metadata/md5-cache/app-text/atril-1.12.2-r5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.16:0=[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.12
+DEPEND=>=app-text/poppler-0.16[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.12
 DESCRIPTION=Atril document viewer for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
 IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.16:0=[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
+RDEPEND=>=app-text/poppler-0.16[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
 REQUIRED_USE=t1lib? ( dvi ) !gtk3? ( !epub )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.12/atril-1.12.2.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60a2861ac593edf6f0d9bdc32bc3bb7e
+_md5_=00c47a2d4925c1a2e47bbfc28872cad5
diff --git a/metadata/md5-cache/app-text/atril-1.14.2-r2 b/metadata/md5-cache/app-text/atril-1.14.2-r2
index 34c30f297492..9aeae18b888f 100644
--- a/metadata/md5-cache/app-text/atril-1.14.2-r2
+++ b/metadata/md5-cache/app-text/atril-1.14.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.16:0=[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.14
+DEPEND=>=app-text/poppler-0.16[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.14
 DESCRIPTION=Atril document viewer for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
 IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.16:0=[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
+RDEPEND=>=app-text/poppler-0.16[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
 REQUIRED_USE=t1lib? ( dvi ) !gtk3? ( !epub )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.14/atril-1.14.2.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8a2bd21bfedc8cd1d5e312f727cd772
+_md5_=4494a3c6930c58b79c8d096a0278d9c5
diff --git a/metadata/md5-cache/app-text/atril-1.16.1-r2 b/metadata/md5-cache/app-text/atril-1.16.1-r2
index 157d30d01ae0..06d9d48da7b7 100644
--- a/metadata/md5-cache/app-text/atril-1.16.1-r2
+++ b/metadata/md5-cache/app-text/atril-1.16.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.22:0=[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
 DESCRIPTION=Atril document viewer for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
 IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.22:0=[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer
+RDEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer
 REQUIRED_USE=t1lib? ( dvi ) !gtk3? ( !epub )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.16/atril-1.16.1.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=664a9484266b5a7e3963b00a39306adb
+_md5_=e768349b174c57663f9015e8fea9dc75
diff --git a/metadata/md5-cache/app-text/atril-1.18.3 b/metadata/md5-cache/app-text/atril-1.18.3
index d5d4414ec6cd..f55fad6abea0 100644
--- a/metadata/md5-cache/app-text/atril-1.18.3
+++ b/metadata/md5-cache/app-text/atril-1.18.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.22:0=[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.4.3:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
+DEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.4.3:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
 DESCRIPTION=Atril document viewer for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
 IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.22:0=[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.4.3:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer
+RDEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.4.3:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer
 REQUIRED_USE=t1lib? ( dvi )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/atril-1.18.3.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bdc5d74e4030dc7a53c5b5d7331dfc82
+_md5_=bf2cab5d99c8a427e96e3dbacf9469f2
diff --git a/metadata/md5-cache/app-text/blogc-0.13.1 b/metadata/md5-cache/app-text/blogc-0.13.2
similarity index 80%
rename from metadata/md5-cache/app-text/blogc-0.13.1
rename to metadata/md5-cache/app-text/blogc-0.13.2
index e3dd04e37d9e..aa5ccad5d338 100644
--- a/metadata/md5-cache/app-text/blogc-0.13.1
+++ b/metadata/md5-cache/app-text/blogc-0.13.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=git? ( dev-vcs/git ) !dev-vcs/blogc-git-receiver !www-servers/blogc-runserver
 SLOT=0
-SRC_URI=https://github.com/blogc/blogc/releases/download/v0.13.1/blogc-0.13.1.tar.xz
+SRC_URI=https://github.com/blogc/blogc/releases/download/v0.13.2/blogc-0.13.2.tar.xz
 _md5_=d29b445bf33556bb45f8817f5e617c58
diff --git a/metadata/md5-cache/app-text/diffpdf-2.1.3-r1 b/metadata/md5-cache/app-text/diffpdf-2.1.3-r2
similarity index 57%
rename from metadata/md5-cache/app-text/diffpdf-2.1.3-r1
rename to metadata/md5-cache/app-text/diffpdf-2.1.3-r2
index d10f24cf733c..d3b2f64f9257 100644
--- a/metadata/md5-cache/app-text/diffpdf-2.1.3-r1
+++ b/metadata/md5-cache/app-text/diffpdf-2.1.3-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=app-text/poppler:=[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/linguist-tools:5
+DEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
 DESCRIPTION=Program that textually or visually compares two PDF files
 EAPI=6
-HOMEPAGE=http://www.qtrac.eu/diffpdf.html
+HOMEPAGE=https://www.qtrac.eu/diffpdf.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5
+RDEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=http://www.qtrac.eu/diffpdf-2.1.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e746ab398e162a56c8fa70db8068d130
+_md5_=013c51cc8e76e33acd2ecc0b389ac83c
diff --git a/metadata/md5-cache/app-text/libmspub-0.1.2 b/metadata/md5-cache/app-text/libmspub-0.1.2
index f5fa816578a6..29544d9dd7ac 100644
--- a/metadata/md5-cache/app-text/libmspub-0.1.2
+++ b/metadata/md5-cache/app-text/libmspub-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing Microsoft Publisher documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libmspub
 IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a8b01265e98c3c8305937490d3a6070e
+_md5_=0cf73c7eb8ecba3dc14b7335d3db256e
diff --git a/metadata/md5-cache/app-text/poppler-0.62.0-r1 b/metadata/md5-cache/app-text/poppler-0.62.0-r1
index 5c56b1cabfed..862e0c075c5c 100644
--- a/metadata/md5-cache/app-text/poppler-0.62.0-r1
+++ b/metadata/md5-cache/app-text/poppler-0.62.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
 RESTRICT=test
 SLOT=0/73
 SRC_URI=https://poppler.freedesktop.org/poppler-0.62.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=457a8b7aaab3ef973b26ec26217c0dbf
+_md5_=29a7572d8ea668b10ac6c256d1ee486d
diff --git a/metadata/md5-cache/app-text/qpdf-7.0.0 b/metadata/md5-cache/app-text/qpdf-7.0.0
index 81ace3019bdb..7b059e12a33e 100644
--- a/metadata/md5-cache/app-text/qpdf-7.0.0
+++ b/metadata/md5-cache/app-text/qpdf-7.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=Command-line tool for structural, content-preserving transformation
 EAPI=6
 HOMEPAGE=http://qpdf.sourceforge.net/
 IUSE=doc examples perl static-libs test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
 LICENSE=|| ( Apache-2.0 Artistic-2 )
 RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
 SLOT=0/18
 SRC_URI=mirror://sourceforge/qpdf/qpdf-7.0.0.tar.gz
-_md5_=15ec0a08292738797e931f0b62bd9204
+_md5_=8f1b0c5b0d81400b04ba733f1d570ec1
diff --git a/metadata/md5-cache/app-text/referencer-1.2.2 b/metadata/md5-cache/app-text/referencer-1.2.2
index f0eaa1a85aa9..2dbfc5288e9d 100644
--- a/metadata/md5-cache/app-text/referencer-1.2.2
+++ b/metadata/md5-cache/app-text/referencer-1.2.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=dev-cpp/gtkmm-2.8:* >=dev-cpp/libglademm-2.6.0 >=dev-cpp/gconfmm-2.14.0 >=dev-libs/boost-1.52.0-r4 >=app-text/gnome-doc-utils-0.3.2 virtual/pkgconfig >=dev-lang/perl-5.8.1 dev-perl/libxml-perl dev-util/intltool app-text/rarian
+DEPEND=>=app-text/poppler-0.12.3-r3[cairo] >=dev-cpp/gtkmm-2.8:* >=dev-cpp/libglademm-2.6.0 >=dev-cpp/gconfmm-2.14.0 >=dev-libs/boost-1.52.0-r4 >=app-text/gnome-doc-utils-0.3.2 virtual/pkgconfig >=dev-lang/perl-5.8.1 dev-perl/libxml-perl dev-util/intltool app-text/rarian
 DESCRIPTION=Application to organise documents or references, and to generate BibTeX files
 EAPI=6
 HOMEPAGE=https://launchpad.net/referencer
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=dev-cpp/gtkmm-2.8:* >=dev-cpp/libglademm-2.6.0 >=dev-cpp/gconfmm-2.14.0 >=dev-libs/boost-1.52.0-r4
+RDEPEND=>=app-text/poppler-0.12.3-r3[cairo] >=dev-cpp/gtkmm-2.8:* >=dev-cpp/libglademm-2.6.0 >=dev-cpp/gconfmm-2.14.0 >=dev-libs/boost-1.52.0-r4
 SLOT=0
 SRC_URI=https://launchpad.net/referencer/1./1.2.2/+download/referencer-1.2.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e1b859c9ae24fbaff4c9959f2c8dda9c
+_md5_=8c2aa25b6f0eb2020c8a5a8f3e61474c
diff --git a/metadata/md5-cache/app-text/texlive-2017 b/metadata/md5-cache/app-text/texlive-2017
index b0a58ee48bad..e26ad418adf0 100644
--- a/metadata/md5-cache/app-text/texlive-2017
+++ b/metadata/md5-cache/app-text/texlive-2017
@@ -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 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 ~arm64 ~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 ~arm64 ~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=metapackage
 RDEPEND=>=app-text/texlive-core-2017 app-text/psutils >=dev-texlive/texlive-fontutils-2017 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-2017 >=dev-texlive/texlive-fontsrecommended-2017 >=dev-texlive/texlive-latex-2017 luatex? ( >=dev-texlive/texlive-luatex-2017 ) >=dev-texlive/texlive-latexrecommended-2017 >=dev-tex/xcolor-2.11 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2017 dev-tex/feynmf ) >=dev-texlive/texlive-plaingeneric-2017 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-2017 >=dev-texlive/texlive-fontsextra-2017 >=dev-texlive/texlive-formatsextra-2017 >=dev-texlive/texlive-latexextra-2017 >=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 ) xetex? ( >=dev-texlive/texlive-xetex-2017 ) graphics? ( >=dev-texlive/texlive-pictures-2017 dev-tex/dot2texi ) epspdf? ( app-text/epspdf ) science? ( >=dev-texlive/texlive-mathscience-2017 ) publishers? ( >=dev-texlive/texlive-publishers-2017 ) music? ( >=dev-texlive/texlive-music-2017 ) pstricks? ( >=dev-texlive/texlive-pstricks-2017 ) context? ( >=dev-texlive/texlive-context-2017 ) games? ( >=dev-texlive/texlive-games-2017 ) humanities? ( >=dev-texlive/texlive-humanities-2017 ) 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-langother-2017 >=dev-texlive/texlive-langother-2017 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2017 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2017 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2017 ) cjk? ( >=dev-texlive/texlive-langcjk-2017 >=dev-tex/cjk-latex-4.8.4 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2017 >=app-text/vlna-1.3 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2017 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2017 ) l10n_en-GB? ( >=dev-texlive/texlive-langenglish-2017 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2017 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2017 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2017 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2017 ) l10n_he? ( >=dev-texlive/texlive-langother-2017 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_as? ( >=dev-texlive/texlive-langother-2017 ) l10n_bn? ( >=dev-texlive/texlive-langother-2017 ) l10n_gu? ( >=dev-texlive/texlive-langother-2017 ) l10n_hi? ( >=dev-texlive/texlive-langother-2017 ) l10n_kn? ( >=dev-texlive/texlive-langother-2017 ) l10n_ml? ( >=dev-texlive/texlive-langother-2017 ) l10n_mr? ( >=dev-texlive/texlive-langother-2017 ) l10n_or? ( >=dev-texlive/texlive-langother-2017 ) l10n_pa? ( >=dev-texlive/texlive-langother-2017 ) l10n_sa? ( >=dev-texlive/texlive-langother-2017 ) l10n_ta? ( >=dev-texlive/texlive-langother-2017 ) l10n_te? ( >=dev-texlive/texlive-langother-2017 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2017 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2017 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2017 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_eo? ( >=dev-texlive/texlive-langother-2017 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2017 ) l10n_ia? ( >=dev-texlive/texlive-langother-2017 ) l10n_id? ( >=dev-texlive/texlive-langother-2017 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lo? ( >=dev-texlive/texlive-langother-2017 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2017 >=dev-texlive/texlive-langcyrillic-2017 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2017 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2017 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_vi? ( >=dev-texlive/texlive-langother-2017 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2017 ) xindy? ( app-text/xindy )
 SLOT=0
-_md5_=b4c23fbb46c5fe39d96621a80b6800cf
+_md5_=4985950bc00dfb124ca1b7fd8d7ad9b9
diff --git a/metadata/md5-cache/app-text/texlive-core-2016-r6 b/metadata/md5-cache/app-text/texlive-core-2016-r6
index 83c2c202e39a..279ccbc9522b 100644
--- a/metadata/md5-cache/app-text/texlive-core-2016-r6
+++ b/metadata/md5-cache/app-text/texlive-core-2016-r6
@@ -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.58.0:= >=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.1.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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39f0f7aa4f1fec6227e9d88db6b77505
+_md5_=f26e249947b11da68ddd39eb4b8ead91
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r3 b/metadata/md5-cache/app-text/texlive-core-2017-r3
index 37cdf8dc410e..2ed123c673e6 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r3
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r3
@@ -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.58.0:= >=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-1.4.5[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-70.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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d650675e5a80b7c30a9c142867104852
+_md5_=ca4a25d9318012f4d5d2c3bc8ce9d34b
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.2.24 b/metadata/md5-cache/app-text/xapian-omega-1.2.24
index 8568473f165a..5f5919b91c3a 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.2.24
+++ b/metadata/md5-cache/app-text/xapian-omega-1.2.24
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=5
-HOMEPAGE=http://www.xapian.org/
+HOMEPAGE=https://xapian.org/
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.2.24/xapian-omega-1.2.24.tar.xz
-_md5_=76cc067fd92135ef417d26783aa55834
+_md5_=1f73ae03444be08250a478cd4524e8d7
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.2.25 b/metadata/md5-cache/app-text/xapian-omega-1.2.25
index 463b64f0c782..6be25134dabf 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.2.25
+++ b/metadata/md5-cache/app-text/xapian-omega-1.2.25
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=5
-HOMEPAGE=http://www.xapian.org/
+HOMEPAGE=https://xapian.org/
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.2.25/xapian-omega-1.2.25.tar.xz
-_md5_=ce2364a069fb25026d2b24a16aae31ef
+_md5_=53d801fcee3275682b212bd09d8b6670
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.4 b/metadata/md5-cache/app-text/xapian-omega-1.4.4
index e2dec50a9de9..dbec0758033e 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.4
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=6
-HOMEPAGE=http://www.xapian.org/
+HOMEPAGE=https://xapian.org/
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.4/xapian-omega-1.4.4.tar.xz
-_md5_=cc606128efaed4cf0cef865facfab0bf
+_md5_=f4962aed272024efbe6cab67ba510647
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.5 b/metadata/md5-cache/app-text/xapian-omega-1.4.5
index 46a04bd03ddc..d7eeaa4f1de7 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.5
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.5
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=6
-HOMEPAGE=http://www.xapian.org/
+HOMEPAGE=https://xapian.org/
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.5/xapian-omega-1.4.5.tar.xz
-_md5_=896c6ce81e54a59edaa5e64ffc5bc22c
+_md5_=86440555ea64bb10f680b41fc68345ea
diff --git a/metadata/md5-cache/app-text/xournal-0.4.8 b/metadata/md5-cache/app-text/xournal-0.4.8
index 90a39d43aefd..559f265fc874 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.8
+++ b/metadata/md5-cache/app-text/xournal-0.4.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An application for notetaking, sketching, and keeping a journal using a stylus
 EAPI=5
 HOMEPAGE=http://xournal.sourceforge.net/
 IUSE=+pdf
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
+RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=mirror://sourceforge/xournal/xournal-0.4.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e6f6707f8a29a6b2287d38bf8bb206b
+_md5_=c88eaff09d7b72f235915658a22ec12e
diff --git a/metadata/md5-cache/app-text/xournal-0.4.8-r1 b/metadata/md5-cache/app-text/xournal-0.4.8-r1
index 0b10d97ff8ba..2cc5d3aaa4d7 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.8-r1
+++ b/metadata/md5-cache/app-text/xournal-0.4.8-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An application for notetaking, sketching, and keeping a journal using a stylus
 EAPI=5
 HOMEPAGE=http://xournal.sourceforge.net/
 IUSE=+pdf vanilla
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
+RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=mirror://sourceforge/xournal/xournal-0.4.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c1b04d131c5506fd23552495b820a751
+_md5_=1cf01cf555b10d303b1e7d087fdcc057
diff --git a/metadata/md5-cache/app-text/xournal-9999 b/metadata/md5-cache/app-text/xournal-9999
index 7f1faeaab1a5..1f3050058b98 100644
--- a/metadata/md5-cache/app-text/xournal-9999
+++ b/metadata/md5-cache/app-text/xournal-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1
+DEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1
 DESCRIPTION=An application for notetaking, sketching, and keeping a journal using a stylus
 EAPI=5
 HOMEPAGE=http://xournal.sourceforge.net/
 IUSE=+pdf
 LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
+RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ff1701e490e48a99e5fc1ec8423b5179
+_md5_=1be693274f4dec37adab7de078aecab7
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
index bcd034066567..c75f870112cf 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install
-DEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:= virtual/pkgconfig
+DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:= virtual/pkgconfig
 DESCRIPTION=PDF plug-in for zathura
 EAPI=5
 HOMEPAGE=http://pwmt.org/projects/zathura/
 KEYWORDS=amd64 arm x86
 LICENSE=ZLIB
-RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:=
+RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:=
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=771c4598f5d7423078e90a83541354c8
+_md5_=866e8559904ce1781322b5b18ace1996
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8
index 521d28a60026..3665a6d1c6d8 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=PDF plug-in for zathura
 EAPI=6
 HOMEPAGE=http://pwmt.org/projects/zathura/
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ZLIB
-RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:=
+RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:=
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=803ac953fda3ec79f54de1620500dae6
+_md5_=f3e948f382cad5272e9e4c672cfa6352
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index 227ed709113d..3fe2777180a9 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1
+DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1
 DESCRIPTION=PDF plug-in for zathura
 EAPI=6
 HOMEPAGE=http://pwmt.org/projects/zathura/
 LICENSE=ZLIB
-RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:=
+RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:=
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=803ac953fda3ec79f54de1620500dae6
+_md5_=f3e948f382cad5272e9e4c672cfa6352
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index d2ce00f0a85a..100e2ae9fb89 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/pathogen-2.4 b/metadata/md5-cache/app-vim/pathogen-2.4
index a2776bca2da7..40b459eee751 100644
--- a/metadata/md5-cache/app-vim/pathogen-2.4
+++ b/metadata/md5-cache/app-vim/pathogen-2.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: manage your runtimepath
 EAPI=5
-HOMEPAGE=https://github.com/tpope/vim-pathogen/ http://www.vim.org/scripts/script.php?script_id=2332
+HOMEPAGE=https://github.com/tpope/vim-pathogen/ https://www.vim.org/scripts/script.php?script_id=2332
 KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-pathogen/archive/v2.4.tar.gz -> pathogen-2.4.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b6ead0bd9052b4a50cb4aa6ec1b774dd
+_md5_=4f72db80e2a5de8b633d60c35fcd4050
diff --git a/metadata/md5-cache/app-vim/rails-5.1 b/metadata/md5-cache/app-vim/rails-5.1
index b3ebe47f3b57..1a99bf2ac9d4 100644
--- a/metadata/md5-cache/app-vim/rails-5.1
+++ b/metadata/md5-cache/app-vim/rails-5.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: aids developing Ruby on Rails applications
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-rails/archive/v5.1.tar.gz -> rails-5.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=ebe817ed51a6e540c156164db9135400
+_md5_=72ed0972470e3fb540cc27a7d384993c
diff --git a/metadata/md5-cache/app-vim/rails-5.2 b/metadata/md5-cache/app-vim/rails-5.2
index 47aa66bd9e18..b7e315dd4e2c 100644
--- a/metadata/md5-cache/app-vim/rails-5.2
+++ b/metadata/md5-cache/app-vim/rails-5.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: aids developing Ruby on Rails applications
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-rails/archive/v5.2.tar.gz -> rails-5.2.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=ebe817ed51a6e540c156164db9135400
+_md5_=72ed0972470e3fb540cc27a7d384993c
diff --git a/metadata/md5-cache/app-vim/recover-0.18 b/metadata/md5-cache/app-vim/recover-0.18
index bae102d8b948..1bb2ac0d230c 100644
--- a/metadata/md5-cache/app-vim/recover-0.18
+++ b/metadata/md5-cache/app-vim/recover-0.18
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: show differences for recovered files
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3068 https://github.com/chrisbra/Recover.vim
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3068 https://github.com/chrisbra/Recover.vim
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/recover-0.18.tar.bz2 https://dev.gentoo.org/~radhermit/vim/recover-0.18.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=5a4b25f3cfff747a836659e9cd36803d
+_md5_=5dab36abb546a16d5d1096312dd357ef
diff --git a/metadata/md5-cache/app-vim/repeat-1.1 b/metadata/md5-cache/app-vim/repeat-1.1
index 7fa13bb247a0..6be49d360152 100644
--- a/metadata/md5-cache/app-vim/repeat-1.1
+++ b/metadata/md5-cache/app-vim/repeat-1.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: use the repeat command "." with plugin maps
 EAPI=5
-HOMEPAGE=https://github.com/tpope/vim-repeat/ http://www.vim.org/scripts/script.php?script_id=2136
+HOMEPAGE=https://github.com/tpope/vim-repeat/ https://www.vim.org/scripts/script.php?script_id=2136
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-repeat/archive/v1.1.tar.gz -> repeat-1.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=76105b67dd72d58b9d8ed7b9530dd849
+_md5_=8c8c241b5b279c95dae7defc75980bce
diff --git a/metadata/md5-cache/app-vim/screen-1.5 b/metadata/md5-cache/app-vim/screen-1.5
index 730838be46eb..ee215bf27756 100644
--- a/metadata/md5-cache/app-vim/screen-1.5
+++ b/metadata/md5-cache/app-vim/screen-1.5
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: simulate a split shell with screen or tmux
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2711
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2711
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( app-misc/screen app-misc/tmux ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/Screen-vim---gnu-screentmux/tarball/1.5 -> screen-1.5.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=45b00527ff5d2655563be1a96f55bfb5
+_md5_=5d76eb2f1d9e00552b770787df0f48bc
diff --git a/metadata/md5-cache/app-vim/searchcomplete-1.1-r1 b/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
index 46c1ec04202f..44d43e4a1e99 100644
--- a/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
+++ b/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: tab completion in searches
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=474
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=474
 KEYWORDS=alpha sparc x86 ia64 ppc amd64
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/searchcomplete-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/searchcomplete-1.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=97ce15f58d8813c8e7597ee831432219
+_md5_=1a1c90ea449aae4266893b70b85063e8
diff --git a/metadata/md5-cache/app-vim/securemodelines-20140926 b/metadata/md5-cache/app-vim/securemodelines-20140926
index 995cf0b6c6f7..454289935e32 100644
--- a/metadata/md5-cache/app-vim/securemodelines-20140926
+++ b/metadata/md5-cache/app-vim/securemodelines-20140926
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: secure, user-configurable modeline support
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/securemodelines-20140926.tar.bz2 https://dev.gentoo.org/~radhermit/vim/securemodelines-20140926.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d18712b7893109fa355eab80c93dc37d
+_md5_=03945aa4306bdcf539fbd2f9b6789982
diff --git a/metadata/md5-cache/app-vim/showmarks-2.2-r1 b/metadata/md5-cache/app-vim/showmarks-2.2-r1
index 547bcd0919fe..ee2ff8860f6b 100644
--- a/metadata/md5-cache/app-vim/showmarks-2.2-r1
+++ b/metadata/md5-cache/app-vim/showmarks-2.2-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: show location marks visually
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=152
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=152
 KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/showmarks-2.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/showmarks-2.2.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=7fd785e5ce36a162671dcf5a906818b4
+_md5_=89d9c8c5f69b9d0416e20becabf7f89e
diff --git a/metadata/md5-cache/app-vim/sleuth-1.0 b/metadata/md5-cache/app-vim/sleuth-1.0
index ddf7632ce6a9..4b8c0dd882c3 100644
--- a/metadata/md5-cache/app-vim/sleuth-1.0
+++ b/metadata/md5-cache/app-vim/sleuth-1.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: heuristically set buffer options
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/sleuth-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sleuth-1.0.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=73fc3702c636f4fe92e413cfc98ba952
+_md5_=58b84c785968427d828580d2fda8474e
diff --git a/metadata/md5-cache/app-vim/sleuth-1.1 b/metadata/md5-cache/app-vim/sleuth-1.1
index 99225d51197b..c581115c6f5d 100644
--- a/metadata/md5-cache/app-vim/sleuth-1.1
+++ b/metadata/md5-cache/app-vim/sleuth-1.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: heuristically set buffer options
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/sleuth-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sleuth-1.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8806751ffbddaf0426fb1227dca4cb4d
+_md5_=7134ef3efe87786bc9c05251d35617e1
diff --git a/metadata/md5-cache/app-vim/slimv-0.9.12-r1 b/metadata/md5-cache/app-vim/slimv-0.9.12-r1
index d709e268c56d..ff189476b0bf 100644
--- a/metadata/md5-cache/app-vim/slimv-0.9.12-r1
+++ b/metadata/md5-cache/app-vim/slimv-0.9.12-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst postrm prepare setup unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2531
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv
 IUSE=python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=public-domain
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://bitbucket.org/kovisoft/slimv/get/0.9.12.tar.bz2 -> slimv-0.9.12.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=578f96994458ee28bff3985af8955cc8
+_md5_=a20008c6e80aaa3c11398629a9678721
diff --git a/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910 b/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910
index 72e197ae3918..ad89817fbf6c 100644
--- a/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910
+++ b/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst postrm prepare setup unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL
 EAPI=6
-HOMEPAGE=https://github.com/kovisoft/slimv
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/kovisoft/slimv/archive/acf9b30be71c54db4f4875d257b905941ca69ed8.tar.gz -> slimv-0.9.13_p20170910.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=ec031533f610477b3bfec9662d6d2360
+_md5_=cac5d213afb1869d3b21b3afd2277d5a
diff --git a/metadata/md5-cache/app-vim/snipmate-0.87-r1 b/metadata/md5-cache/app-vim/snipmate-0.87-r1
index 3650210a426f..eb915603b9f3 100644
--- a/metadata/md5-cache/app-vim/snipmate-0.87-r1
+++ b/metadata/md5-cache/app-vim/snipmate-0.87-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: TextMate-style snippets
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2540 https://github.com/garbas/vim-snipmate
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2540 https://github.com/garbas/vim-snipmate
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=app-vim/vim-addon-mw-utils app-vim/tlib || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/garbas/vim-snipmate/archive/v0.87.tar.gz -> snipmate-0.87.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=c8fe19120e33c25fd291972601406903
+_md5_=b5ad62f2d6f1d418b3abbb37d4002ff8
diff --git a/metadata/md5-cache/app-vim/sudoedit-0.21 b/metadata/md5-cache/app-vim/sudoedit-0.21
index b7ae938c4e0a..f384bcd3c9fa 100644
--- a/metadata/md5-cache/app-vim/sudoedit-0.21
+++ b/metadata/md5-cache/app-vim/sudoedit-0.21
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: edit files using sudo or su
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2709 https://github.com/chrisbra/SudoEdit.vim
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2709 https://github.com/chrisbra/SudoEdit.vim
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( app-admin/sudo sys-apps/shadow ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/sudoedit-0.21.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sudoedit-0.21.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d8f20bb79b623d00d341f9098f750213
+_md5_=c6f24345f59ee0aaaf9737fcf0b18037
diff --git a/metadata/md5-cache/app-vim/supertab-2.1 b/metadata/md5-cache/app-vim/supertab-2.1
index 86feeb01065a..bb61bc306570 100644
--- a/metadata/md5-cache/app-vim/supertab-2.1
+++ b/metadata/md5-cache/app-vim/supertab-2.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: enhanced Tab key functionality
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1643 https://github.com/ervandew/supertab/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1643 https://github.com/ervandew/supertab/
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/ervandew/supertab/archive/2.1.tar.gz -> supertab-2.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=e0caae18616cd1b8531069188bfad26e
+_md5_=d02827d26a89968338a2ba79499a643f
diff --git a/metadata/md5-cache/app-vim/surround-2.1-r1 b/metadata/md5-cache/app-vim/surround-2.1-r1
index dd8ed82ec8e2..39b8748f0005 100644
--- a/metadata/md5-cache/app-vim/surround-2.1-r1
+++ b/metadata/md5-cache/app-vim/surround-2.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Delete/change/add parentheses/quotes/XML-tags & much more
 EAPI=5
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1697
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1697
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/surround-2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/surround-2.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=a053acf16db74dca9faa2b60d15cf584
+_md5_=c58999fc8c5e5fff5696a104ad21083b
diff --git a/metadata/md5-cache/app-vim/syntastic-3.8.0 b/metadata/md5-cache/app-vim/syntastic-3.8.0
index c6432e3c0163..14d4cf664bf1 100644
--- a/metadata/md5-cache/app-vim/syntastic-3.8.0
+++ b/metadata/md5-cache/app-vim/syntastic-3.8.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax checking using external tools
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/
 KEYWORDS=amd64 x86
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/syntastic/archive/3.8.0.tar.gz -> syntastic-3.8.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=756d79dcaebe4d5a04bff9988079d1f8
+_md5_=2ed62fc9d6b5522a27f0fd4a22a776ce
diff --git a/metadata/md5-cache/app-vim/syntastic-9999 b/metadata/md5-cache/app-vim/syntastic-9999
index f0d540980df1..3eda673286c8 100644
--- a/metadata/md5-cache/app-vim/syntastic-9999
+++ b/metadata/md5-cache/app-vim/syntastic-9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: syntax checking using external tools
 EAPI=6
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=248c71185317f7bf8bb580d2478a3ef1
+_md5_=912be59823b5b0367bf4e3c46adb7f28
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 3cf345a0e1f0..865ee9cc145e 100644
Binary files a/metadata/md5-cache/dev-ada/Manifest.gz and b/metadata/md5-cache/dev-ada/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ada/langkit-2017 b/metadata/md5-cache/dev-ada/langkit-2017
index 61ab2a5b6d29..337228dba8fe 100644
--- a/metadata/md5-cache/dev-ada/langkit-2017
+++ b/metadata/md5-cache/dev-ada/langkit-2017
@@ -4,11 +4,11 @@ DESCRIPTION=A Python framework to generate language parsers
 EAPI=6
 HOMEPAGE=https://www.adacore.com/community
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-ada/gnatcoll[gnat_2017,iconv,shared] dev-python/mako dev-python/pyyaml dev-python/enum34 dev-python/funcy dev-python/docutils dev-python/quex
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044 -> langkit-gps-src-2017.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3ef8b091de76ae1463902bc444ad0b5e
+_md5_=38e42858e6840cf6318c19532cb20a26
diff --git a/metadata/md5-cache/dev-ada/libadalang-2017 b/metadata/md5-cache/dev-ada/libadalang-2017
index e1241f6c132a..aaca54591321 100644
--- a/metadata/md5-cache/dev-ada/libadalang-2017
+++ b/metadata/md5-cache/dev-ada/libadalang-2017
@@ -4,11 +4,11 @@ DESCRIPTION=high performance semantic engine for the Ada programming language
 EAPI=6
 HOMEPAGE=https://libre.adacore.com/
 IUSE=gnat_2016 +gnat_2017 python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 gcc-runtime-library-exception-3.1
 RDEPEND=dev-python/pyyaml dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=] 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_targets_python2_7 ^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042 -> libadalang-2017-src.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ad3009dadd4d216df1a241e721c91bd1
+_md5_=6081dc61129a060ee5e29866bc1efa3a
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index aae5ef6f839b..f68eb3fc8922 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.9 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.9
index 8a00abff0a47..29f3a77aa0da 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.9
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.9
@@ -3,10 +3,10 @@ DEPEND=app-arch/lz4:0= app-editors/vim-core <dev-libs/boost-1.65.0:= dev-libs/li
 DESCRIPTION=Hot backup utility for MySQL based servers
 EAPI=6
 HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core <dev-libs/boost-1.65.0:= dev-libs/libaio <dev-libs/libedit-20170329.3.1 dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib !dev-db/xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.9/source/tarball/percona-xtrabackup-2.4.9.tar.gz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf60666e342fcbc1db17d9ccf42a3fc0
+_md5_=bcdeead9783a1bc580037c06a3a45324
diff --git a/metadata/md5-cache/dev-db/postgresql-10.3 b/metadata/md5-cache/dev-db/postgresql-10.3
index 85050399a668..f7309ed4faa9 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.3
+++ b/metadata/md5-cache/dev-db/postgresql-10.3
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib 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 ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-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= ) server? ( systemd? ( sys-apps/systemd ) ) 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:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 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=10
 SRC_URI=mirror://postgresql/source/v10.3/postgresql-10.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2a7ad007cc6367550c5cac0d1d2ff2e4
+_md5_=83c727415cf7d14d48f071f271a46354
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.22 b/metadata/md5-cache/dev-db/postgresql-9.3.22
index 1a096f29c3c2..78d59f6c63d6 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.22
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.22
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib 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 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-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= ) 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_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.3
 SRC_URI=mirror://postgresql/source/v9.3.22/postgresql-9.3.22.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17e42ec79446e0a00ff5a66e1e6a90b8
+_md5_=16efb5c9cc86a33a70291aa41d42a444
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.17 b/metadata/md5-cache/dev-db/postgresql-9.4.17
index c6ce27a70756..a4c76c1e6df7 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.17
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.17
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib 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 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-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.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_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.4
 SRC_URI=mirror://postgresql/source/v9.4.17/postgresql-9.4.17.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=24a517a5bf5b41178f1266f9a7bf5cf1
+_md5_=c05e8ee9ba8630e1ae318062fb4e691c
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.12 b/metadata/md5-cache/dev-db/postgresql-9.5.12
index 4db1fcc87651..c58f84bf2532 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.12
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.12
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib 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 ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-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.12/postgresql-9.5.12.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2c37668c6c0affec4f3b0adfd718a00a
+_md5_=a505a14820cc820a353b4d9f2085a419
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.8 b/metadata/md5-cache/dev-db/postgresql-9.6.8
index ee4ef704e11a..0dd1624ef8e2 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.8
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.8
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib 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 ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-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:= ) ) server? ( systemd? ( sys-apps/systemd ) ) 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.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 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.6
 SRC_URI=mirror://postgresql/source/v9.6.8/postgresql-9.6.8.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2dfb3c0e35007d10bda7f500d553437e
+_md5_=37a7c3cd9ebfd23f6953ec683d69bcff
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.5-r1 b/metadata/md5-cache/dev-db/unixODBC-2.3.5-r1
index ea85fec15f92..b46ad5d906dd 100644
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.5-r1
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A complete ODBC driver manager
 EAPI=6
 HOMEPAGE=http://www.unixodbc.org/
 IUSE=+minimal odbcmanual static-libs unicode abi_x86_32 abi_x86_64 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 ~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 ~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 LGPL-2.1
 RDEPEND=|| ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/libtool-2.4.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(-)?] ) >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?]
 SLOT=0
 SRC_URI=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.5.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=14d305284d1c514cdb437ca49cf79f3e
+_md5_=afee242819fde4e7c7b2e4709db945dc
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 42b63d88bcc1..3c30b6fe7555 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.5.5 b/metadata/md5-cache/dev-games/openscenegraph-3.5.5
index f958ed5c1361..f6da1ce0b4b0 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.5.5
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=Open source high performance 3D graphics toolkit
 EAPI=6
 HOMEPAGE=http://www.openscenegraph.org/
 IUSE=asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib
-KEYWORDS=amd64 ~hppa ~ia64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 x86
 LICENSE=wxWinLL-3 LGPL-2.1
 RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=sdl2? ( sdl )
 SLOT=0/145
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.5.5.tar.gz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=99e1682782048d1ab4e9b34c88beb10b
+_md5_=33e62e7b8378c3d68dedca3d3e00e378
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 98f0a0931ec4..de7b6313716e 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016 b/metadata/md5-cache/dev-lang/gnat-gpl-2016
index 2f7b4a4f06b5..2ecd9249844e 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=680717a20a6b7dbfcbc9f3be696d3f17
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017 b/metadata/md5-cache/dev-lang/gnat-gpl-2017
index ea6ce5a6b591..115fc07494eb 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=!sys-devel/gcc:6.3.0 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=!sys-devel/gcc:6.3.0 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=5
 HOMEPAGE=http://libre.adacore.com/
@@ -7,9 +7,9 @@ IUSE=bootstrap regression-test vanilla altivec debug doc gcj awt hardened multil
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
-RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14 )
+RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e2ec04d7db3f68773e3e39a84d114c13
diff --git a/metadata/md5-cache/dev-lang/nim-0.18.0 b/metadata/md5-cache/dev-lang/nim-0.18.0
index 41958c2314a2..616de95729fe 100644
--- a/metadata/md5-cache/dev-lang/nim-0.18.0
+++ b/metadata/md5-cache/dev-lang/nim-0.18.0
@@ -7,7 +7,8 @@ IUSE=doc +readline test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=readline? ( sys-libs/readline:0= )
+RESTRICT=test
 SLOT=0
 SRC_URI=https://nim-lang.org/download/nim-0.18.0.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=19a903a7ab2ef9278a9705cdb47858cb
+_md5_=26cd04847cd91b0865b6da8f8554ac36
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.7.10 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.10
new file mode 100644
index 000000000000..81b9cea53d7c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.7.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=free, small, and standard compliant Prolog compiler
+EAPI=5
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.10.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=49c0c9d662391dd462544188441b7e75
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4515481f03bd..1ad793e050b6 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2 b/metadata/md5-cache/dev-libs/beignet-1.3.2
index f1173da8723d..90af82153bc8 100644
--- a/metadata/md5-cache/dev-libs/beignet-1.3.2
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,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/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ocl-icd? ( dev-libs/ocl-icd ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,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/clang-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-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(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ocl-icd? ( dev-libs/ocl-icd ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=OpenCL implementation for Intel GPUs
 EAPI=6
 HOMEPAGE=https://01.org/beignet
 IUSE=ocl-icd ocl20 abi_x86_32 abi_x86_64 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
 LICENSE=LGPL-2.1+
-RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,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/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] app-eselect/eselect-opencl
+RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,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/clang-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-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(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] app-eselect/eselect-opencl
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fccd3ad5d028888349af17fa7cc606d
+_md5_=a9e1427cba09fc8d3df8003d16168e1f
diff --git a/metadata/md5-cache/dev-libs/boost-1.65.0 b/metadata/md5-cache/dev-libs/boost-1.65.0
index dc9a9b6c5df9..f991063bda76 100644
--- a/metadata/md5-cache/dev-libs/boost-1.65.0
+++ b/metadata/md5-cache/dev-libs/boost-1.65.0
@@ -4,7 +4,7 @@ DESCRIPTION=Boost Libraries for C++
 EAPI=6
 HOMEPAGE=http://www.boost.org/
 IUSE=context debug doc icu +nls mpi python static-libs +threads tools 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 ~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 ~x86-winnt
+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 ~sparc64-solaris ~x86-solaris ~x86-winnt
 LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.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(-)?] ) !icu? ( 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(-)?] ) mpi? ( >=virtual/mpi-2.0-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(-)?,cxx,threads] ) 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(-)] ) 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(-)?] 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(-)?] !app-admin/eselect-boost
 REQUIRED_USE=mpi? ( 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/1.65.0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=77ec0137ca117e5de634c4999b947b9b
+_md5_=8e3215384f6d0bb8c65242e2ffb636a8
diff --git a/metadata/md5-cache/dev-libs/icu-60.2 b/metadata/md5-cache/dev-libs/icu-60.2
index a7382406708b..9eeb4a8cee00 100644
--- a/metadata/md5-cache/dev-libs/icu-60.2
+++ b/metadata/md5-cache/dev-libs/icu-60.2
@@ -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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 SLOT=0/60.2
 SRC_URI=http://download.icu-project.org/files/icu4c/60.2/icu4c-60_2-src.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec01920bc8f3492d4ad2572f56fa34cb
+_md5_=710b9233671c47caf64532ac75a5f6f4
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-60.2 b/metadata/md5-cache/dev-libs/icu-layoutex-60.2
index 813fb62dc60d..0cb3860c8abc 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-60.2
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-60.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 sparc x86
+KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=~dev-libs/icu-60.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/60.2
 SRC_URI=http://download.icu-project.org/files/icu4c/60.2/icu4c-60_2-src.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d1e621c7883f82530caa67eefd632a1
+_md5_=869773a4cf00cdabf215cd5bdb69ce1c
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.4.0 b/metadata/md5-cache/dev-libs/leatherman-1.4.0
index a25ab908a6cb..0d8ad13a9a02 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.4.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=A C++ toolkit
 EAPI=6
 HOMEPAGE=https://github.com/puppetlabs/leatherman
 IUSE=debug static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
 SLOT=0/1.4
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.4.0.tar.gz -> leatherman-1.4.0.tar.gz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a551a9b6e223d5268a0e062a19059f1f
+_md5_=4c7fe6b15580523e31588ce9251460b9
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.26.3 b/metadata/md5-cache/dev-libs/libgit2-0.26.3
new file mode 100644
index 000000000000..20365d922563
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-0.26.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A linkable library for Git
+EAPI=6
+HOMEPAGE=https://libgit2.github.com/
+IUSE=+curl examples gssapi libressl +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+SLOT=0/26
+SRC_URI=https://github.com/libgit2/libgit2/archive/v0.26.3.tar.gz -> libgit2-0.26.3.tar.gz
+_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=547c5c8d2a55591b403b37065de8dd6f
diff --git a/metadata/md5-cache/dev-libs/libgit2-9999 b/metadata/md5-cache/dev-libs/libgit2-9999
index 32346a15ed7b..b828601cccc9 100644
--- a/metadata/md5-cache/dev-libs/libgit2-9999
+++ b/metadata/md5-cache/dev-libs/libgit2-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A linkable library for Git
-EAPI=5
+EAPI=6
 HOMEPAGE=https://libgit2.github.com/
-IUSE=examples gssapi libressl +ssh test +threads trace
+IUSE=+curl examples gssapi libressl +ssh test +threads trace
 LICENSE=GPL-2-with-linking-exception
-RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 SLOT=0/26
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e8c6e3fa68ab231432008434f95879c
+_md5_=f1ed87feb949bc3ddc610f218f62349d
diff --git a/metadata/md5-cache/dev-libs/libmowgli-2.1.3 b/metadata/md5-cache/dev-libs/libmowgli-2.1.3
index 83164f200d4e..4ac595185450 100644
--- a/metadata/md5-cache/dev-libs/libmowgli-2.1.3
+++ b/metadata/md5-cache/dev-libs/libmowgli-2.1.3
@@ -4,9 +4,9 @@ DESCRIPTION=Useful set of performance and usability-oriented extensions to C
 EAPI=6
 HOMEPAGE=https://github.com/atheme/libmowgli-2
 IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !=dev-libs/libmowgli-2.1.0
 SLOT=2
 SRC_URI=https://github.com/atheme/libmowgli-2/archive/v2.1.3.tar.gz -> libmowgli-2.1.3.tar.gz
-_md5_=863597c38df311b497222e027020e245
+_md5_=2d4023d96c4ebbb29a7d0a4167614f88
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index c5ba7e61a88a..5da9b213be9c 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.0
index 82fb61b926c0..5e5cdb67c677 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=OCaml bindings for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-6.0.0:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6.0.0
 SRC_URI=https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8383a652e4a53ca1731c483cf19bc317
+_md5_=51ff3d0f7375bd578e35a9ef3c01d5e6
diff --git a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.100 b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.100
deleted file mode 100644
index 371c909f82ce..000000000000
--- a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-vcs/git virtual/perl-Encode dev-perl/File-Which virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor >=dev-perl/Net-SSLeay-1.490.0 >=dev-perl/IO-Socket-SSL-1.560.0 >=dev-perl/Module-Build-Tiny-0.34.0 test? ( >=virtual/perl-Test-Simple-0.890.0 ) dev-lang/perl:=
-DESCRIPTION=Utility to merge PRs from the Gentoo Github repository
-EAPI=6
-HOMEPAGE=https://github.com/monsieurp/Gentoo-App-Pram
-IUSE=test
-KEYWORDS=amd64 x86 ~amd64-fbsd
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-vcs/git virtual/perl-Encode dev-perl/File-Which virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor >=dev-perl/Net-SSLeay-1.490.0 >=dev-perl/IO-Socket-SSL-1.560.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MO/MONSIEURP/Gentoo-App-Pram-0.100100.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9c13ff7b142c1f0285aa4496c7ae22a2
diff --git a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.200 b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.200
index b10b4780a036..f1717d4c70ce 100644
--- a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.200
+++ b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.100.200
@@ -4,10 +4,10 @@ DESCRIPTION=Utility to merge PRs from the Gentoo Github repository
 EAPI=6
 HOMEPAGE=https://github.com/monsieurp/Gentoo-App-Pram
 IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-vcs/git virtual/perl-Encode dev-perl/File-Which virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor >=dev-perl/Net-SSLeay-1.490.0 >=dev-perl/IO-Socket-SSL-1.560.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MO/MONSIEURP/Gentoo-App-Pram-0.100200.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=0084f87010b503f3f466e52a4f1d4490
+_md5_=86e9af36c2efa1b1252014cd5d471824
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 579cbf4d9a5f..0292f39baf7b 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Plack-1.3.900 b/metadata/md5-cache/dev-perl/Plack-1.3.900
deleted file mode 100644
index 134e99409604..000000000000
--- a/metadata/md5-cache/dev-perl/Plack-1.3.900
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 ) >=dev-perl/Apache-LogFormat-Compiler-0.120.0 >=dev-perl/Cookie-Baker-0.50.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Body-1.60.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=virtual/perl-Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.0.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 virtual/perl-parent virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( !minimal? ( dev-perl/Authen-Simple-Passwd dev-perl/HTTP-Request-AsCGI dev-perl/HTTP-Server-Simple-PSGI dev-perl/IO-Handle-Util dev-perl/Log-Dispatch dev-perl/Log-Dispatch-Array dev-perl/Log-Log4perl dev-perl/LWP-Protocol-http10 dev-perl/MIME-Types dev-perl/Module-Refresh ) dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=
-DESCRIPTION=Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Plack/
-IUSE=test minimal examples
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 ) >=dev-perl/Apache-LogFormat-Compiler-0.120.0 >=dev-perl/Cookie-Baker-0.50.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Body-1.60.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=virtual/perl-Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.0.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 virtual/perl-parent dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0039.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=5eb29cb93e1d52c9da03335d273505e8
diff --git a/metadata/md5-cache/dev-perl/Plack-1.4.300 b/metadata/md5-cache/dev-perl/Plack-1.4.300
deleted file mode 100644
index 825ece9eb731..000000000000
--- a/metadata/md5-cache/dev-perl/Plack-1.4.300
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 >=dev-perl/Log-Dispatch-2.250.0 dev-perl/Log-Log4perl dev-perl/Module-Refresh ) >=dev-perl/Apache-LogFormat-Compiler-0.330.0 >=dev-perl/Cookie-Baker-0.70.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Entity-Parser-0.170.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=virtual/perl-Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.0.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 >=dev-perl/WWW-Form-UrlEncoded-0.230.0 virtual/perl-parent virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( !minimal? ( dev-perl/Authen-Simple-Passwd dev-perl/HTTP-Request-AsCGI dev-perl/HTTP-Server-Simple-PSGI dev-perl/Log-Dispatch-Array dev-perl/LWP-Protocol-http10 dev-perl/MIME-Types >=dev-perl/Test-MockTime-HiRes-0.60.0 ) dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=
-DESCRIPTION=Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/Plack/
-IUSE=test minimal examples examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 >=dev-perl/Log-Dispatch-2.250.0 dev-perl/Log-Log4perl dev-perl/Module-Refresh ) >=dev-perl/Apache-LogFormat-Compiler-0.330.0 >=dev-perl/Cookie-Baker-0.70.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Entity-Parser-0.170.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=virtual/perl-Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.0.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 >=dev-perl/WWW-Form-UrlEncoded-0.230.0 virtual/perl-parent dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0043.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=1ddada65d73e8bae2cc71fad88adeb6a
diff --git a/metadata/md5-cache/dev-perl/Set-Object-1.350.0 b/metadata/md5-cache/dev-perl/Set-Object-1.350.0
deleted file mode 100644
index 77d9068c9c6c..000000000000
--- a/metadata/md5-cache/dev-perl/Set-Object-1.350.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=set of objects and strings
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Set-Object/
-IUSE=test
-KEYWORDS=amd64 ~hppa ~ppc x86
-LICENSE=Artistic-2
-RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.35.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8d5bbc103830e4703ff74fd2a46d8d97
diff --git a/metadata/md5-cache/dev-perl/ShipIt-0.600.0 b/metadata/md5-cache/dev-perl/ShipIt-0.600.0
deleted file mode 100644
index f1af160a9e97..000000000000
--- a/metadata/md5-cache/dev-perl/ShipIt-0.600.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Software Release Tool
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/ShipIt/
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/ShipIt-0.60.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c1f08ca9b9a3afe1e59c5920923bf95
diff --git a/metadata/md5-cache/dev-perl/Term-ReadLine-TTYtter-1.4 b/metadata/md5-cache/dev-perl/Term-ReadLine-TTYtter-1.4
deleted file mode 100644
index 315cb7219dd5..000000000000
--- a/metadata/md5-cache/dev-perl/Term-ReadLine-TTYtter-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Quick implementation of readline utilities for ttytter
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Term-ReadLine-TTYtter/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/TermReadKey dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CK/CKAISER/Term-ReadLine-TTYtter-1.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1bf42671dd0ff4daf9f679a9607ca733
diff --git a/metadata/md5-cache/dev-perl/Text-Diff-1.450.0 b/metadata/md5-cache/dev-perl/Text-Diff-1.450.0
new file mode 100644
index 000000000000..d3c4d4f288bc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Diff-1.450.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Algorithm-Diff-1.190.0 virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Perform diffs on files and record sets
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Text-Diff/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Algorithm-Diff-1.190.0 virtual/perl-Exporter dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=e7338023216b056755887d02716186c0
diff --git a/metadata/md5-cache/dev-perl/Text-Format-0.600.0 b/metadata/md5-cache/dev-perl/Text-Format-0.600.0
new file mode 100644
index 000000000000..f01638b81ce2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Format-0.600.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Various subroutines to format text
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Text-Format/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.60.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=90ba6353b11625ceb8dd7ecbce8c0b95
diff --git a/metadata/md5-cache/dev-perl/Text-Glob-0.110.0 b/metadata/md5-cache/dev-perl/Text-Glob-0.110.0
new file mode 100644
index 000000000000..206b153f7329
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Glob-0.110.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Match globbing patterns against text
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Text-Glob/
+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
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=64f06bf0eeebd8082086d2c51064fa6e
diff --git a/metadata/md5-cache/dev-perl/Text-Table-1.133.0 b/metadata/md5-cache/dev-perl/Text-Table-1.133.0
new file mode 100644
index 000000000000..1a59a5aaab59
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Table-1.133.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/Text-Aligner-0.50.0 >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Organize Data in Tables
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Text-Table/
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/Text-Aligner-0.50.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.133.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=8f964c0da06891db009e88fac93ee5c4
diff --git a/metadata/md5-cache/dev-perl/Text-Template-1.510.0 b/metadata/md5-cache/dev-perl/Text-Template-1.510.0
new file mode 100644
index 000000000000..8e41ad809eb2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Template-1.510.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Temp virtual/perl-Safe virtual/perl-Test-Simple dev-perl/Test-Warnings ) dev-lang/perl:=
+DESCRIPTION=Expand template text with embedded Perl
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Text-Template/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~x86 ~ppc-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.51.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=813cf9f794c23f5d3447f12272f8ef4e
diff --git a/metadata/md5-cache/dev-perl/Tie-Cycle-1.225.0 b/metadata/md5-cache/dev-perl/Tie-Cycle-1.225.0
new file mode 100644
index 000000000000..395e35a6f856
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-Cycle-1.225.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp >=virtual/perl-ExtUtils-MakeMaker-6.640.0 virtual/perl-File-Spec test? ( >=virtual/perl-Test-Simple-0.950.0 ) dev-lang/perl:=
+DESCRIPTION=Cycle through a list of values via a scalar
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Tie-Cycle/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=255bc28cb555597add5891e770a83f94
diff --git a/metadata/md5-cache/dev-perl/Time-Moment-0.430.0 b/metadata/md5-cache/dev-perl/Time-Moment-0.430.0
new file mode 100644
index 000000000000..016fb0e8abe6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-Moment-0.430.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Time-HiRes >=virtual/perl-XSLoader-0.20.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 >=virtual/perl-ExtUtils-ParseXS-3.180.0 test? ( >=dev-perl/Test-Fatal-0.6.0 >=dev-perl/Test-Number-Delta-1.60.0 dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=
+DESCRIPTION=Represents a date and time of day with an offset from UTC
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Time-Moment/
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Time-HiRes >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Time-Moment-0.43.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=8d83843ae6abdea524586604fe61e3c5
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 5818749a116c..735506deabef 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.10 b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
index face7694575f..718de88d2fb3 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.10
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of Python 3.3's lzma module for XZ/LZMA compressed files
 EAPI=6
 HOMEPAGE=https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/
 IUSE=test python_targets_pypy python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/xz-utils:0= dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.10.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c4cfa12c73a2241834168745cb11415f
+_md5_=4389c7f20cb87583fb7390c9c7d19780
diff --git a/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1 b/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
index ec764848a384..352ef6843c1a 100644
--- a/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A backport of the get_terminal_size function from Python 3.3's shuti
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/backports.shutil_get_terminal_size/ https://github.com/chrippa/backports.shutil_get_terminal_size
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/backports[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=mirror://pypi/b/backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-1.0.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3412e4298a2f086a190ecd063dd810a8
+_md5_=f4259c30054e16eedeb684a82178260f
diff --git a/metadata/md5-cache/dev-python/bz2file-0.98 b/metadata/md5-cache/dev-python/bz2file-0.98
index dbc9c109e6d4..3ced5528d855 100644
--- a/metadata/md5-cache/dev-python/bz2file-0.98
+++ b/metadata/md5-cache/dev-python/bz2file-0.98
@@ -4,11 +4,11 @@ DESCRIPTION=Replacement for bz2.BZ2File with features from newest CPython
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/bz2file https://github.com/nvawda/bz2file
 IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bz2file/bz2file-0.98.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8f9816a64e7bed2ef5f454d9a992ec20
+_md5_=e0fb896d84feace84b9a925f1fc6abbb
diff --git a/metadata/md5-cache/dev-python/clang-python-6.0.0 b/metadata/md5-cache/dev-python/clang-python-6.0.0
index d9b3860aa7f0..cbed6613dbb7 100644
--- a/metadata/md5-cache/dev-python/clang-python-6.0.0
+++ b/metadata/md5-cache/dev-python/clang-python-6.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for sys-devel/clang
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd
 LICENSE=UoI-NCSA
 RDEPEND=>=sys-devel/clang-6.0.0:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[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(-)]
 REQUIRED_USE=|| ( 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://releases.llvm.org/6.0.0/cfe-6.0.0.src.tar.xz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7f13883175207141b2b6dc11e8ea6449
+_md5_=78009c43c6e3cf5f31be5c73b2d3d675
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20170823 b/metadata/md5-cache/dev-python/cliapp-1.20170823
index 6ea55f36739a..de441c4e8051 100644
--- a/metadata/md5-cache/dev-python/cliapp-1.20170823
+++ b/metadata/md5-cache/dev-python/cliapp-1.20170823
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for Unix-like command line programs
 EAPI=6
 HOMEPAGE=http://liw.fi/cliapp/
 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 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-python/pyyaml[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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/cliapp-1.20170823.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=124a108a6877814d43b4269d7427dd63
+_md5_=a2b8af418be4630b84b54e6fb691733e
diff --git a/metadata/md5-cache/dev-python/colorspacious-1.1.0 b/metadata/md5-cache/dev-python/colorspacious-1.1.0
index d6a19de866c5..2512e02dd07d 100644
--- a/metadata/md5-cache/dev-python/colorspacious-1.1.0
+++ b/metadata/md5-cache/dev-python/colorspacious-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Powerful, accurate, and easy-to-use Python library for colorspace co
 EAPI=6
 HOMEPAGE=http://colorspacious.readthedocs.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[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(-)]
 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/colorspacious/colorspacious-1.1.0.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e26cae24fb388d8eb0884f31ca46488f
+_md5_=23c9ace87712d775e1b99a9efe8d1cc1
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.5.5 b/metadata/md5-cache/dev-python/contextlib2-0.5.5
index 0ebddd52cc25..35b2e479cf5c 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.5.5
+++ b/metadata/md5-cache/dev-python/contextlib2-0.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=Backports and enhancements for the contextlib module
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/contextlib2
 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=amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
 LICENSE=PSF-2.4
 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/contextlib2/contextlib2-0.5.5.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31553056863f73fc38261b80228aa43a
+_md5_=f0d1fc2dc23e19f5ce89328d1d822049
diff --git a/metadata/md5-cache/dev-python/ipython-5.4.1 b/metadata/md5-cache/dev-python/ipython-5.4.1
index 83fd173e9126..e9078bdb8b03 100644
--- a/metadata/md5-cache/dev-python/ipython-5.4.1
+++ b/metadata/md5-cache/dev-python/ipython-5.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Advanced interactive shell for Python
 EAPI=6
 HOMEPAGE=http://ipython.org/
 IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 PDEPEND=notebook? ( dev-python/notebook[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/ipywidgets[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(-)] ) qt5? ( dev-python/qtconsole[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(-)] ) smp? ( dev-python/ipyparallel[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/decorator[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/jedi-0.10.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(-)] dev-python/pexpect[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/pickleshare[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/prompt_toolkit-1.0.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(-)] dev-python/pyparsing[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/simplegeneric[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/traitlets-4.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(-)] matplotlib? ( dev-python/matplotlib[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(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) virtual/python-pathlib[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(-)] nbconvert? ( dev-python/nbconvert[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[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-5.4.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f5b0eab4ec26165b4fcd5e07a6a8765
+_md5_=c4c3271889b35c311dbbfafa70cb2058
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
index 35568271e37f..1b898dffcd94 100644
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Vestigial utilities from IPython
 EAPI=6
 HOMEPAGE=https://github.com/ipython/ipython_genutils
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ppc64 ~x86
 LICENSE=BSD
 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
 SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b734f39511eeb5acfbf0a8257894504f
+_md5_=63303cf1f712b31339b33b741efd78a8
diff --git a/metadata/md5-cache/dev-python/jedi-0.11.1 b/metadata/md5-cache/dev-python/jedi-0.11.1
index 8392c49f9103..739992854db4 100644
--- a/metadata/md5-cache/dev-python/jedi-0.11.1
+++ b/metadata/md5-cache/dev-python/jedi-0.11.1
@@ -4,7 +4,7 @@ DESCRIPTION=Autocompletion library for Python
 EAPI=6
 HOMEPAGE=https://github.com/davidhalter/jedi
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/parso-0.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(-)] 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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.11.1.tar.gz -> jedi-0.11.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=92bafb34e3dcf277e88ee2819ef68bff
+_md5_=589978869e8ddbc8896ccce12c970d9c
diff --git a/metadata/md5-cache/dev-python/lit-6.0.0 b/metadata/md5-cache/dev-python/lit-6.0.0
index 1073a58edbc2..f52dfedc180e 100644
--- a/metadata/md5-cache/dev-python/lit-6.0.0
+++ b/metadata/md5-cache/dev-python/lit-6.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
 LICENSE=UoI-NCSA
 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef40bc2e6d108ea0bd5309d008f70829
+_md5_=a2e61381d72656c053270dd6f15b6f8a
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.8 b/metadata/md5-cache/dev-python/markdown-2.6.8
index e0cb0839ea1b..36bf78c76d9f 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.8
+++ b/metadata/md5-cache/dev-python/markdown-2.6.8
@@ -4,11 +4,11 @@ DESCRIPTION=Python implementation of the markdown markup language
 EAPI=6
 HOMEPAGE=http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown https://pythonhosted.org/Markdown/ https://github.com/waylan/Python-Markdown
 IUSE=doc test pygments 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 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=pygments? ( dev-python/pygments[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/M/Markdown/Markdown-2.6.8.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe7126b51287b2b1181c7d776317d9fd
+_md5_=75b11c5cd52094a54bf0fd397aa6d0bc
diff --git a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2 b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
index 5c04e283df1d..b51d0e1f4846 100644
--- a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
+++ b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A python module to inject warning filters during nosetest
 EAPI=6
 HOMEPAGE=https://github.com/Carreau/nose_warnings_filters
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/nose[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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose_warnings_filters/nose_warnings_filters-0.1.5.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d57226263930b42a571cc1720279dcf
+_md5_=5414453a35de1b044f6d9e6bbd579ac4
diff --git a/metadata/md5-cache/dev-python/paramiko-2.4.0 b/metadata/md5-cache/dev-python/paramiko-2.4.0
index df5ec4f51911..4dbf4e570cba 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.4.0
+++ b/metadata/md5-cache/dev-python/paramiko-2.4.0
@@ -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 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/bcrypt-3.1.3[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/cryptography-1.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(-)] >=dev-python/pynacl-1.0.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=https://github.com/paramiko/paramiko/archive/2.4.0.tar.gz -> paramiko-2.4.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7e9b32b662aaffececd366d1e167e5d0
+_md5_=840d3684428db8e04c30c351e16d82e1
diff --git a/metadata/md5-cache/dev-python/parso-0.1.1 b/metadata/md5-cache/dev-python/parso-0.1.1
index ee847db1cd62..97132ed2c149 100644
--- a/metadata/md5-cache/dev-python/parso-0.1.1
+++ b/metadata/md5-cache/dev-python/parso-0.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=a python parser that supports error recovery and round-trip parsing
 EAPI=6
 HOMEPAGE=https://github.com/davidhalter/parso https://pypi.python.org/pypi/parso
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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/davidhalter/parso/archive/v0.1.1.tar.gz -> parso-0.1.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fccbf47e8d0169c196bc80d732d43b41
+_md5_=a5ee6476ec2c1907129276a9750416d2
diff --git a/metadata/md5-cache/dev-python/pathlib-1.0.1-r1 b/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
index f5ec79ae6f6c..24b9d1135afa 100644
--- a/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Object-oriented filesystem paths
 EAPI=5
 HOMEPAGE=https://pathlib.readthedocs.org/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7
-KEYWORDS=amd64 arm64 ia64 ppc64 x86
+KEYWORDS=amd64 arm64 ia64 ~ppc ppc64 x86
 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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib/pathlib-1.0.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=868e37cecaf8d52601f208277353aad3
+_md5_=22700db4815904068c8b3e2d4f8349a3
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.0 b/metadata/md5-cache/dev-python/pathlib2-2.3.0
index 8d1898265c80..db401466a996 100644
--- a/metadata/md5-cache/dev-python/pathlib2-2.3.0
+++ b/metadata/md5-cache/dev-python/pathlib2-2.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Fork of pathlib aiming to support the full stdlib Python API
 EAPI=6
 HOMEPAGE=https://github.com/mcmtroffaes/pathlib2
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( dev-python/scandir[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/scandir[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib2/pathlib2-2.3.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3429f3245dc902daa9ac7adb0a943582
+_md5_=d5b7611e57c6862b3365a6bbfd5141b6
diff --git a/metadata/md5-cache/dev-python/pbr-3.1.1 b/metadata/md5-cache/dev-python/pbr-3.1.1
index 463c328446ed..619be3f001e2 100644
--- a/metadata/md5-cache/dev-python/pbr-3.1.1
+++ b/metadata/md5-cache/dev-python/pbr-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
 EAPI=6
 HOMEPAGE=https://github.com/openstack-dev/pbr
 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=amd64 arm arm64 hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~amd64-fbsd
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=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/pbr/pbr-3.1.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d14f5829bb524211db1e8b72fe3e5aa
+_md5_=05b8c48447d3a84a06998e8f4bae27db
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1 b/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
index ef55a2c9a245..9a54c923ab36 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A small 'shelve' like datastore with concurrency support
 EAPI=6
 HOMEPAGE=https://github.com/pickleshare/pickleshare
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/path-py-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(-)]
 REQUIRED_USE=|| ( 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/pickleshare/pickleshare-0.7.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ea2993841d6ad842b04af751f684cbf6
+_md5_=76110762a31529b2a08cae90072d2308
diff --git a/metadata/md5-cache/dev-python/pluggy-0.6.0 b/metadata/md5-cache/dev-python/pluggy-0.6.0
index 5750b4c1949c..6ae1c887ac1f 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.6.0
+++ b/metadata/md5-cache/dev-python/pluggy-0.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=plugin and hook calling mechanisms for python
 EAPI=6
 HOMEPAGE=https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.python.org/pypi/pluggy
 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 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=mirror://pypi/p/pluggy/pluggy-0.6.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=52ef6299096dbd3dd9aec0f34d62b417
+_md5_=c9959f60b160ca92f169b7fc8e5e7a7b
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15 b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
index 4f452b32d332..5b20dc76ae5a 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
@@ -4,11 +4,11 @@ DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.9.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(-)] dev-python/wcwidth[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(-)]
 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/prompt_toolkit/prompt_toolkit-1.0.15.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7e8f533b6d4b4e0657e8c8cd730bdbfb
+_md5_=bb2c0b3cefe36efb9388666bf89bcd6b
diff --git a/metadata/md5-cache/dev-python/pydispatcher-2.1.2 b/metadata/md5-cache/dev-python/pydispatcher-2.1.2
new file mode 100644
index 000000000000..b3bf739cbab4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydispatcher-2.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] 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=Multi-producer-multi-consumer signal dispatching mechanism
+EAPI=6
+HOMEPAGE=https://github.com/scrapy/pypydispatcher https://pypi.python.org/pypi/PyPyDispatcher
+IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ia64 ~ppc ~x86
+LICENSE=BSD
+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
+SRC_URI=mirror://pypi/P/PyPyDispatcher/PyPyDispatcher-2.1.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=87b9135d68e5d277cff585b80cfe2c0e
diff --git a/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11 b/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11
index 989cd49aadd9..b1e799edd27d 100644
--- a/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11
@@ -4,11 +4,11 @@ DESCRIPTION=Virtualenv fixture for py.test
 EAPI=6
 HOMEPAGE=https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-fixture-config
 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=amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=dev-python/pytest[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/pytest-fixture-config/pytest-fixture-config-1.2.11.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44d237e22a40df9e700050bba9772b7d
+_md5_=79ce692eee82bdc7acf70a9d076e4198
diff --git a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0 b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0
index 1911a21ffb5f..3a520b6871a0 100644
--- a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0
+++ b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=py.test plugin for relaxed test discovery and organization
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/pytest-relaxed https://github.com/bitprophet/pytest-relaxed
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=BSD-2
 RDEPEND=>=dev-python/pytest-3[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/six-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/decorator-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(-)]
 REQUIRED_USE=|| ( 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/pytest-relaxed/pytest-relaxed-1.1.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91e3a72345cd79009970853e87ab5fa8
+_md5_=a632811f5bcbd1cf6ed318bec66703e0
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.2.11 b/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
index 3ec488f5695f..2e8bc3e6d8a0 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
@@ -4,11 +4,11 @@ DESCRIPTION=A goodie-bag of unix shell and environment tools for py.test
 EAPI=6
 HOMEPAGE=https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-shutil
 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=amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=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(-)] dev-python/execnet[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/contextlib2[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[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/path-py[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/p/pytest-shutil/pytest-shutil-1.2.11.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a1000e30166de536dea9c599fca7d534
+_md5_=41aaa4cbe0e92c44b7ccaf0ddbcc8fa6
diff --git a/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11 b/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
index 55135393fc44..da1592da8493 100644
--- a/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
@@ -4,11 +4,11 @@ DESCRIPTION=Virtualenv fixture for py.test
 EAPI=6
 HOMEPAGE=https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-virtualenv
 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=amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=dev-python/pytest-fixture-config[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-shutil[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[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/virtualenv[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/pytest-virtualenv/pytest-virtualenv-1.2.11.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f50579b66abe3f28d66dd429863abe15
+_md5_=66ea0d20d53059b4651d193caf828dd1
diff --git a/metadata/md5-cache/dev-python/python-poppler-0.12.1-r4 b/metadata/md5-cache/dev-python/python-poppler-0.12.1-r4
index dabf9aa3e548..3ddbd8e990b5 100644
--- a/metadata/md5-cache/dev-python/python-poppler-0.12.1-r4
+++ b/metadata/md5-cache/dev-python/python-poppler-0.12.1-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)] >=app-text/poppler-0.15.0:=[cairo] >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170422
+DEPEND=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(-)] >=app-text/poppler-0.15.0[cairo] >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170422
 DESCRIPTION=Python bindings to the Poppler PDF library
 EAPI=5
 HOMEPAGE=https://launchpad.net/poppler-python
 IUSE=examples python_targets_python2_7
 KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-text/poppler-0.15.0:=[cairo] >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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(-)] >=app-text/poppler-0.15.0[cairo] >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/poppler-python/trunk/development/+download/pypoppler-0.12.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=682fab5afae128018c3d48b1a8dd7ae1
+_md5_=41adb1fd99c5e3658ac72e28a5162499
diff --git a/metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214 b/metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214
index e83691aed392..9d6870203964 100644
--- a/metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214
+++ b/metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-text/poppler:=[qt5] dev-python/PyQt5[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(-)] 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(-)]
+DEPEND=app-text/poppler[qt5] dev-python/PyQt5[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(-)] 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=A python binding for libpoppler-qt5
 EAPI=6
 HOMEPAGE=https://github.com/wbsoft/python-poppler-qt5
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=app-text/poppler:=[qt5] dev-python/PyQt5[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(-)] 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(-)]
+RDEPEND=app-text/poppler[qt5] dev-python/PyQt5[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(-)] 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/wbsoft/python-poppler-qt5/archive/50fb2eb9ea34cf94e3756b7ddfc601af023267d5.tar.gz -> python-poppler-qt5-0.24.2_p20170214.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e4ce2717377552eaa117ca3ca92adae
+_md5_=fa0b94b8e33e9790f839abdf10007953
diff --git a/metadata/md5-cache/dev-python/root_numpy-3.2.0 b/metadata/md5-cache/dev-python/root_numpy-3.2.0
deleted file mode 100644
index 9c2cbd1822f7..000000000000
--- a/metadata/md5-cache/dev-python/root_numpy-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sci-physics/root[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(+)] test? ( dev-python/nose[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 ) >=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(+)]
-DESCRIPTION=Interface between ROOT and numpy
-EAPI=5
-HOMEPAGE=https://github.com/rootpy/root_numpy
-IUSE=examples test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sci-physics/root[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(+)] 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_targets_python2_7
-SLOT=0
-SRC_URI=mirror://pypi/r/root_numpy/root_numpy-3.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84e214645e9e762b1b94fa438cfd5527
diff --git a/metadata/md5-cache/dev-python/root_numpy-3.3.0 b/metadata/md5-cache/dev-python/root_numpy-3.3.0
deleted file mode 100644
index e6822b1a6621..000000000000
--- a/metadata/md5-cache/dev-python/root_numpy-3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sci-physics/root[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(+)] test? ( dev-python/nose[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 ) >=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(+)]
-DESCRIPTION=Interface between ROOT and numpy
-EAPI=5
-HOMEPAGE=https://github.com/rootpy/root_numpy
-IUSE=examples test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sci-physics/root[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(+)] 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_targets_python2_7
-SLOT=0
-SRC_URI=mirror://pypi/r/root_numpy/root_numpy-3.3.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84e214645e9e762b1b94fa438cfd5527
diff --git a/metadata/md5-cache/dev-python/root_numpy-3.3.1 b/metadata/md5-cache/dev-python/root_numpy-3.3.1
deleted file mode 100644
index a9ab366c49ec..000000000000
--- a/metadata/md5-cache/dev-python/root_numpy-3.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sci-physics/root[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(+)] test? ( dev-python/nose[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 ) >=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(+)]
-DESCRIPTION=Interface between ROOT and numpy
-EAPI=5
-HOMEPAGE=https://github.com/rootpy/root_numpy
-IUSE=examples test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sci-physics/root[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(+)] 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_targets_python2_7
-SLOT=0
-SRC_URI=mirror://pypi/r/root_numpy/root_numpy-3.3.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84e214645e9e762b1b94fa438cfd5527
diff --git a/metadata/md5-cache/dev-python/root_numpy-4.7.3 b/metadata/md5-cache/dev-python/root_numpy-4.7.3
new file mode 100644
index 000000000000..d282b951cda7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/root_numpy-4.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sci-physics/root:=[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(+)] test? ( dev-python/nose[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 ) >=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(+)]
+DESCRIPTION=Interface between ROOT and numpy
+EAPI=5
+HOMEPAGE=https://github.com/rootpy/root_numpy
+IUSE=examples test python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sci-physics/root:=[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(+)] 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_targets_python2_7
+SLOT=0
+SRC_URI=mirror://pypi/r/root_numpy/root_numpy-4.7.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0ca6667f739475c8b5daace15517c3cb
diff --git a/metadata/md5-cache/dev-python/scandir-1.7 b/metadata/md5-cache/dev-python/scandir-1.7
index 9e3ebbffd259..1e42c99ea465 100644
--- a/metadata/md5-cache/dev-python/scandir-1.7
+++ b/metadata/md5-cache/dev-python/scandir-1.7
@@ -4,11 +4,11 @@ DESCRIPTION=A better directory iterator and faster os.walk()
 EAPI=6
 HOMEPAGE=https://github.com/benhoyt/scandir
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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/scandir/scandir-1.7.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=49b8b9d5f45e95318546fd629cdb2871
+_md5_=b93fc38f57e5b9c73bb5163eadc99d9a
diff --git a/metadata/md5-cache/dev-python/setuptools-38.5.1 b/metadata/md5-cache/dev-python/setuptools-38.5.1
index 3de2f846348f..4b32c53e8c61 100644
--- a/metadata/md5-cache/dev-python/setuptools-38.5.1
+++ b/metadata/md5-cache/dev-python/setuptools-38.5.1
@@ -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=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 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=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-38.5.1.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5708d4d47c1e06c4cc627ae95f7c9ae4
+_md5_=1a5b977b9abb1f23a9da6d5cce9e08a0
diff --git a/metadata/md5-cache/dev-python/setuptools-git-1.2 b/metadata/md5-cache/dev-python/setuptools-git-1.2
index 2d13b4eaa92c..10cf083be1c8 100644
--- a/metadata/md5-cache/dev-python/setuptools-git-1.2
+++ b/metadata/md5-cache/dev-python/setuptools-git-1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Setuptools revision control system plugin for Git
 EAPI=6
 HOMEPAGE=https://github.com/wichert/setuptools-git
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
 LICENSE=BSD
 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(-)] dev-vcs/git 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/s/setuptools-git/setuptools-git-1.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=923c5ad9d9b6b10650a82fc24516f059
+_md5_=bcf6a3e3a72e24fb81294b038c1d18d9
diff --git a/metadata/md5-cache/dev-python/subprocess32-3.2.7 b/metadata/md5-cache/dev-python/subprocess32-3.2.7
index 7151b5a99188..fcbd39838b18 100644
--- a/metadata/md5-cache/dev-python/subprocess32-3.2.7
+++ b/metadata/md5-cache/dev-python/subprocess32-3.2.7
@@ -4,11 +4,11 @@ DESCRIPTION=A backport of the subprocess module from Python 3.2/3.3 for use on 2
 EAPI=6
 HOMEPAGE=https://github.com/google/python-subprocess32
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=PSF-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/subprocess32/subprocess32-3.2.7.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e681ac78b2fa0b04e3c6de48877fce9b
+_md5_=c20e16e03d14dc9072ab326d98448ca4
diff --git a/metadata/md5-cache/dev-python/tenacity-4.8.0 b/metadata/md5-cache/dev-python/tenacity-4.8.0
index 7d1e1087d1fa..ca6f6bb85aaa 100644
--- a/metadata/md5-cache/dev-python/tenacity-4.8.0
+++ b/metadata/md5-cache/dev-python/tenacity-4.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pbr[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[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(-)]
+DEPEND=dev-python/pbr[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/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(-)] 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=General-purpose retrying library
 EAPI=6
 HOMEPAGE=https://github.com/jd/tenacity
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=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(-)] virtual/python-futures[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/monotonic-0.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(-)] 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 )
+RDEPEND=>=dev-python/six-1.9.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(-)] virtual/python-futures[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/monotonic-0.6[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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tenacity/tenacity-4.8.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83ccd941e64ad5094885ab6c674b83d6
+_md5_=5d1f59e3310c170afb27305377838aa6
diff --git a/metadata/md5-cache/dev-python/testpath-0.3.1 b/metadata/md5-cache/dev-python/testpath-0.3.1
index f594e150d8db..8c55630523c2 100644
--- a/metadata/md5-cache/dev-python/testpath-0.3.1
+++ b/metadata/md5-cache/dev-python/testpath-0.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Test utilities for code working with files and commands
 EAPI=6
 HOMEPAGE=http://jupyter.org
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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/jupyter/testpath/archive/0.3.1.tar.gz -> testpath-0.3.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09bdb891ecd9f669bbe46348332f004c
+_md5_=fa9c8397defa7849d574f2514e22414c
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.2 b/metadata/md5-cache/dev-python/traitlets-4.3.2
index bfc1731c9aec..68230e237043 100644
--- a/metadata/md5-cache/dev-python/traitlets-4.3.2
+++ b/metadata/md5-cache/dev-python/traitlets-4.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A configuration system for Python applications
 EAPI=6
 HOMEPAGE=https://github.com/ipython/traitlets
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/decorator[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-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipython_genutils[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/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(-)] 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/t/traitlets/traitlets-4.3.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d176391622d999ed452c34ae210fc570
+_md5_=45f0b99cc8f6634472c92120a30cc182
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.35 b/metadata/md5-cache/dev-python/ttystatus-0.35
index 771403a04035..91d8793781e0 100644
--- a/metadata/md5-cache/dev-python/ttystatus-0.35
+++ b/metadata/md5-cache/dev-python/ttystatus-0.35
@@ -4,11 +4,11 @@ DESCRIPTION=Terminal progress bar and status output for command line
 EAPI=5
 HOMEPAGE=http://liw.fi/ttystatus/
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/ttystatus/snapshot/ttystatus-0.35.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5220c2abfc10cd25e2fb98dc9f86a002
+_md5_=84ee0b77243f4bf0ea961a06ca7aa0c2
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1 b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
index 8557208c21fa..341ade5916f3 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
+++ b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Measures number of Terminal column cells of wide-character codes
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/wcwidth/ https://github.com/jquast/wcwidth
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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/w/wcwidth/wcwidth-0.1.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f511c2ddd2541b2bc057e753e4000a9
+_md5_=77193c4fa1fa0f9b3d80f933a99d7c3a
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 38f5a213141d..38b79cca3257 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/assistant-5.7.1 b/metadata/md5-cache/dev-qt/assistant-5.7.1
index d2d1bcab351a..5b6d63a1cc09 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.7.1
+++ b/metadata/md5-cache/dev-qt/assistant-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qthelp-5.7.1 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=de955874787a8d09b48d66997db7bf7e
diff --git a/metadata/md5-cache/dev-qt/assistant-5.9.4 b/metadata/md5-cache/dev-qt/assistant-5.9.4
index fe48400f0bda..9f773d188906 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.9.4
+++ b/metadata/md5-cache/dev-qt/assistant-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qthelp-5.9.4 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a806569a20446ff23f59a051b2aaec37
diff --git a/metadata/md5-cache/dev-qt/designer-5.7.1 b/metadata/md5-cache/dev-qt/designer-5.7.1
index 89ef166548da..f361854ac3c0 100644
--- a/metadata/md5-cache/dev-qt/designer-5.7.1
+++ b/metadata/md5-cache/dev-qt/designer-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=65e8725189331a3117b88194437a6f0d
diff --git a/metadata/md5-cache/dev-qt/designer-5.9.4 b/metadata/md5-cache/dev-qt/designer-5.9.4
index 3b95e892c400..4f13d9848838 100644
--- a/metadata/md5-cache/dev-qt/designer-5.9.4
+++ b/metadata/md5-cache/dev-qt/designer-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=445062d5d4d8ddd2d4c9a8f09c6776a7
diff --git a/metadata/md5-cache/dev-qt/linguist-5.7.1 b/metadata/md5-cache/dev-qt/linguist-5.7.1
index 2343ebcddd8e..8182f6cd8e6d 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.7.1
+++ b/metadata/md5-cache/dev-qt/linguist-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a3ee70abae8cae0fb3fb0b5f636404be
diff --git a/metadata/md5-cache/dev-qt/linguist-5.9.4 b/metadata/md5-cache/dev-qt/linguist-5.9.4
index 4da0411cae70..7879e34ca933 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.9.4
+++ b/metadata/md5-cache/dev-qt/linguist-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=830549cf778eb08b692feea85d950300
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.7.1 b/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
index c880392b2a23..21c56f64e4a3 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=dbeed594e096764ff6642240bd1240cf
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.9.4 b/metadata/md5-cache/dev-qt/linguist-tools-5.9.4
index 43f4fb4889a2..6afb89524e61 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.9.4
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtxml-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=bf91e97fcd44906ddcf3ce8b70711718
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.7.1 b/metadata/md5-cache/dev-qt/pixeltool-5.7.1
index 6f97890fb5cd..3b110e2fc75c 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.7.1
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=665ad50021991975ec683a46c3a3b72d
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.9.4 b/metadata/md5-cache/dev-qt/pixeltool-5.9.4
index 69a3499a41d8..60908a826f60 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.9.4
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=aa9b9c5c415920bd5268209770a0eb97
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.7.1 b/metadata/md5-cache/dev-qt/qdbus-5.7.1
index c1c32ddf908d..c2b16bf2369f 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdbus-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtxml-5.7.1 dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6dda8a2de2af7ed29b71cc6fdc914ed4
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.9.4 b/metadata/md5-cache/dev-qt/qdbus-5.9.4
index 9fec29e56a09..3b9801e22a04 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.9.4
+++ b/metadata/md5-cache/dev-qt/qdbus-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 ~dev-qt/qtxml-5.9.4 dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ae627c0d21e8b38a694f94526832d4cc
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
index 352dc3a10953..1e79673318e3 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f54c355e28463628eed095d295a48211
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.4 b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.4
index 9c71bb93f378..348e100a12e7 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.4
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=01b962991d1329df214d24065600b7d6
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.7.1 b/metadata/md5-cache/dev-qt/qdoc-5.7.1
index 6485ca21eb5a..4fee24f5eedb 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdoc-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9d7d023c64c918edf558c7ea703cf9e4
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.9.4 b/metadata/md5-cache/dev-qt/qdoc-5.9.4
index 3b7d7b1869a1..d657c978a18e 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.9.4
+++ b/metadata/md5-cache/dev-qt/qdoc-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=274a4acab892678f62a3f3a0f3467f84
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1 b/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
index bd895fa61439..4a30a5ad2b2c 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qt3d-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a14cade7a74204bc44bc18e96f732f95
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.9.4 b/metadata/md5-cache/dev-qt/qt3d-5.9.4
index 45e31fbe88ad..641434f2734f 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.9.4
+++ b/metadata/md5-cache/dev-qt/qt3d-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qt3d-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=b0f27108666b914c013a885990a9cdd1
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
index ea23d331e270..eca60e9ed95d 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 >=n
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtconnectivity-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=2b95f75a1c6c5d4586fe1c7eeb71342f
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.4 b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.4
index 96ddb098ed9f..92ef5cd8d08d 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.9.4 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 >=n
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtconnectivity-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=884eb2a940b9d9bdb48ff10e8cc7ef0c
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.7.1 b/metadata/md5-cache/dev-qt/qtcharts-5.7.1
index b578a84a817a..91b0be7f037d 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 qml? (
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtcharts-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7a25fc03e96bb3ae33fa8569bebd2f4e
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.9.4 b/metadata/md5-cache/dev-qt/qtcharts-5.9.4
index af7b31108f16..1837d7e42508 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidgets-5.9.4 qml? (
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtcharts-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=af69ac4f669ba6c4edd9b20ca84fbce7
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
index 8bdbc6de243d..31738e4735af 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fe9e4778b359dcd21362dc37c1ce3b82
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.4 b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.4
index 99c710eee878..9d915095d780 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0b7a3f908df3496de09350a89797a3f8
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.7.1-r4 b/metadata/md5-cache/dev-qt/qtcore-5.7.1-r4
index 73d6ef30d1cb..f44c02c13de9 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.7.1-r4
+++ b/metadata/md5-cache/dev-qt/qtcore-5.7.1-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcr
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=71c3bb666c93a94091cd2ad0de7fcda7
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.9.4-r2 b/metadata/md5-cache/dev-qt/qtcore-5.9.4-r2
index fa9f007e1718..a0c06dabf06a 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.9.4-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.9.4-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=705a76abac4bbe8419c7dda66cb990eb
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
index a9a508c97be4..e1f7db17c3ec 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] qml? ( ~dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdatavis3d-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5efd699a913bf017c8ae7b2f715d37cb
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.4 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.4
index 4319f6c369c9..c96ab1bc43de 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] qml? ( ~dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtdatavis3d-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=4f21dea58f96d06896536007b6de8dae
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.7.1 b/metadata/md5-cache/dev-qt/qtdbus-5.7.1
index d9cc4143a5bd..835af55798d4 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=300d9f5a3bb98682966d30148e5f7e0c
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.9.4 b/metadata/md5-cache/dev-qt/qtdbus-5.9.4
index a8d6e514b1f0..5a6141314410 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0bbe3dc6da7799cb081f15b6aa087f05
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
index 76b302a4fab3..4daf847a0f0b 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=3c04f179185fb1c7beaa54553ad7ecc8
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
index fd9052312430..267ce1177de1 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=692ec7c258748fa466d999f56eba960a
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.4 b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.4
index e4acd4af162b..16eaf3ca4a36 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtdeclarative-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=463689d5cd7fac5b3136c71d4519a775
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.7.1 b/metadata/md5-cache/dev-qt/qtdiag-5.7.1
index f8b633282589..877e6a334c08 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] d
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=708fd8fee5f122532763ee938714342c
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.9.4 b/metadata/md5-cache/dev-qt/qtdiag-5.9.4
index 8a21d09ed93e..b8020bf44110 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 network? ( ~dev-qt/qtnetwork-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=95acc32e2d3f5c899322d8c9bc1df214
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
index 9a18ca30f872..05d7465c6ea1 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 dev
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtgraphicaleffects-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9c6d36e0a8bba5a791b151bbafc83bf0
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.4 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.4
index c60910917fae..ca547621029a 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 dev
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtgraphicaleffects-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=379988901174bbbe1ecd1dae36bb81f9
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
index a028ec48b86d..cd835d5128b0 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f3f7e257dfac151c52801eeae2bb30a3
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.9.4-r3 b/metadata/md5-cache/dev-qt/qtgui-5.9.4-r3
index 9f5bc419ca70..57b92d4d9958 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.9.4-r3
+++ b/metadata/md5-cache/dev-qt/qtgui-5.9.4-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a936ac315d75235ca0ff3d9e9a627569
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.7.1 b/metadata/md5-cache/dev-qt/qthelp-5.7.1
index fb939b336a4e..5f664ec0cfc0 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.7.1
+++ b/metadata/md5-cache/dev-qt/qthelp-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fa55ec04300e0ca5a2486351482374c2
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.9.4 b/metadata/md5-cache/dev-qt/qthelp-5.9.4
index 07c6a312f47b..366c0ac8dcce 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.9.4
+++ b/metadata/md5-cache/dev-qt/qthelp-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7fcec33e5ca44ec5532c063f57768dba
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.7.1 b/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
index 5c3dd7658399..7c3bea868c0a 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 media-libs/jasper:= media-libs/
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtimageformats-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5b45684084405c2cb0a770ef1e1b39e5
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.9.4 b/metadata/md5-cache/dev-qt/qtimageformats-5.9.4
index 9f75f56f8f67..7f3cf7c70d44 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4 media-libs/libwebp:= media-libs
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtimageformats-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=30de7f78795a3cf32bbc4e02a68add81
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.7.1 b/metadata/md5-cache/dev-qt/qtlocation-5.7.1
index 52f8116a8e6d..a2020e609919 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f16af598359c715ab69d2186912d6241
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.9.4 b/metadata/md5-cache/dev-qt/qtlocation-5.9.4
index 425108396c33..b2d96f2dd1ed 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtlocation-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=c7083a2d84f0b31591195e3020bada06
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
index 4d5d6ca0559e..98e9afacab6d 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtmultimedia-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a414cbddbd38fee4600900317d79a91e
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4 b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4
index 849103849b7e..5a67c30f6592 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtmultimedia-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=bbbcd4c034b6427962ef21a1b1ffbdea
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4-r1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4-r1
index d0d0b7abcc04..b8e66d8f2d54 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4-r1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.4-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtnetwork-5.9.4
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtmultimedia-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=2d7e1df04b102c94544efa3adae883d0
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.7.1 b/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
index 71333eaf21eb..170978792e02 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.7
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=cd3aab100c8c0dc80d1971f915f37739
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.9.4 b/metadata/md5-cache/dev-qt/qtnetwork-5.9.4
index 6bb9b53346cb..3bd73de66dda 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a1dca7736809ac37cab5ea11354d4ae8
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.4 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.4
index 7ae539388213..7275b6a8bbb5 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtnetworkauth-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=c4663a10aeec8aeecbb3d294d2678729
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.7.1 b/metadata/md5-cache/dev-qt/qtopengl-5.7.1
index f861717e003d..276b31ae40a9 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=33702d61bc94ebe2ec41d4e571334f27
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.9.4 b/metadata/md5-cache/dev-qt/qtopengl-5.9.4
index 872d22631b85..87454ff4197e 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtwidgets-5.9.4
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9893b662facf50c975389790b82e24b1
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.7.1 b/metadata/md5-cache/dev-qt/qtpaths-5.7.1
index 2bf0d61493e9..e439f8eff2ae 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e7030b81bb1e1985ffae10ff05325f23
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.9.4 b/metadata/md5-cache/dev-qt/qtpaths-5.9.4
index ede370e61cb5..50068dd78c92 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=23375c4eecad9165609c104837158e02
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1 b/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
index 01cf88096c90..2c0e36725899 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0643ba650e59cc2fddf0bc18627ce522
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.4 b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.4
index c1d15817f208..3df2cd14334d 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a468c26cc030a4f2c3a0cf9b7788dcc4
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.7.1 b/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
index 4dca91729437..bd23ba2811a8 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 geoclue? ( ~dev-qt/qtdbus-5.7.1 ) qml? ( ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=b31f28eda98b13c7fad47cd84b0d34e9
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.9.4 b/metadata/md5-cache/dev-qt/qtpositioning-5.9.4
index 48bfe49dadab..eb1502c052d7 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.9.4
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 geoclue? ( ~dev-qt/qtdbus-5.9.4 ) qml? ( ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtlocation-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=32e60caa19fd41418a7137c0880faaf0
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
index 4671738f7988..6c889a0598a0 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f5562e8a887725d43355c80fe98d6160
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.4 b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.4
index 5b788a1a98f2..0616a0c0e096 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=] ~dev-qt/qtwidgets-5.9.4
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f31f60a09d03fc9fdba20e51790bd858
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
index 7439ee7bb146..ffb1cdec9db2 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 wid
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=d373fd8804095291aca0e9d045cbdff6
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.4 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.4
index 8a2ee9236d41..ecdfd1828450 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 wid
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=06cac9e9f94c9abfa93ddd7c99a5870d
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
index 46ca7b05a90b..3d3d9ad7d0e1 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgraphicaleffe
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols2-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=76a8075e6e58ad1696f5c0890c901074
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.4 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.4
index 2c5d2ab8d985..44a684578d91 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 wid
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols2-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=d78d95cfdc208b9988ce7cb49267f1b0
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.7.1 b/metadata/md5-cache/dev-qt/qtscript-5.7.1
index 30d566f6a0f1..95e7a3d6570f 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtscript-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 scripttools? ( ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidget
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtscript-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6736b2476fc9c5189625b2e941b40dac
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.9.4 b/metadata/md5-cache/dev-qt/qtscript-5.9.4
index acaa24c8744d..c47254dd207c 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtscript-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 scripttools? ( ~dev-qt/qtgui-5.9.4 ~dev-qt/qtwidget
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscript-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ebb9e2d1b27417c457741b3c517ecb0f
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.7.1 b/metadata/md5-cache/dev-qt/qtscxml-5.7.1
index 258500c2a5f7..66dd89345dc3 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtscxml-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=04055beb06fbfb7fc86acdffb7b666e8
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.9.4 b/metadata/md5-cache/dev-qt/qtscxml-5.9.4
index 9361c1996626..7b588bb38ff2 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscxml-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=931899ecf2935db1b1545f4395bf26e6
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.7.1 b/metadata/md5-cache/dev-qt/qtsensors-5.7.1
index fa0e195c4d1a..33308293ba4c 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtsensors-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=c1fd72b820f83b02661f11d402a9ef3e
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.9.4 b/metadata/md5-cache/dev-qt/qtsensors-5.9.4
index 9e8709119752..6a5d576d3f84 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdbus-5.9.4 qml? ( ~dev-qt/qtdeclarative-5
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsensors-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=146be5b8fa4ac5bdc1202ffcc8846e7a
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.9.4 b/metadata/md5-cache/dev-qt/qtserialbus-5.9.4
index 579e2ca56263..d851ec986a58 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 ~dev-qt/qtserialport-5.9.4
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialbus-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fb20edd5e4970b927693f51fe6d0307a
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.7.1 b/metadata/md5-cache/dev-qt/qtserialport-5.7.1
index f153afcd2633..4a31e842801c 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtserialport-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=49ce7180d4115c76818f44cba7912401
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.9.4 b/metadata/md5-cache/dev-qt/qtserialport-5.9.4
index 335e1b19e9f3..8cdc9fcdd9a6 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialport-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=28799061d0de088a508254da213c4048
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.9.4 b/metadata/md5-cache/dev-qt/qtspeech-5.9.4
index de5ee08005df..3ed240d8dd06 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.4 dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtspeech-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=68ce3ecc9edcd600a938784a6dd05b01
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
index f31dd8e5ef3b..fda20ccbc085 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7ecd0247ff405156a5eb037f9ad10438
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.9.4-r1 b/metadata/md5-cache/dev-qt/qtsql-5.9.4-r1
index 1b5f8ea1b929..56d9d496b631 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.9.4-r1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.9.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a3e3c44a9f2e0b38cb2bd5d76820ca0a
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.7.1 b/metadata/md5-cache/dev-qt/qtsvg-5.7.1
index 08f21920120d..df1fa49dccde 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 >=sys-l
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtsvg-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fbcd165e7e76f2890e625ef87af67018
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.9.4-r2 b/metadata/md5-cache/dev-qt/qtsvg-5.9.4-r2
index f2e2a1481bd8..2d46b4fac31f 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.9.4-r2
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.9.4-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.9.4-r1:5/5.9 ~dev-qt/qtgui-5.9.4 >=dev-qt/qtwidgets-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsvg-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e25ec1c3cae80a917292ec5f16bae431
diff --git a/metadata/md5-cache/dev-qt/qttest-5.7.1 b/metadata/md5-cache/dev-qt/qttest-5.7.1
index d1189539b49e..56e980c876b2 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.7.1
+++ b/metadata/md5-cache/dev-qt/qttest-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=aebe413ac76c08a586128816d0313a81
diff --git a/metadata/md5-cache/dev-qt/qttest-5.9.4 b/metadata/md5-cache/dev-qt/qttest-5.9.4
index 1b916302782a..2ede177af3e6 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.9.4
+++ b/metadata/md5-cache/dev-qt/qttest-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9a09cc19525a8a5ee513ec51be34440a
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.7.1 b/metadata/md5-cache/dev-qt/qttranslations-5.7.1
index cad56fa3581f..8c57c28da767 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.7.1
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttranslations-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0c557233df3820f27212a7aab0264ef6
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.9.4 b/metadata/md5-cache/dev-qt/qttranslations-5.9.4
index dfc80d4a508a..712e7bf57f55 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.9.4
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttranslations-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=911268480aaf0c5dd8ec6c742358e3c2
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
index 9ef1217d643c..060e47f82609 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=d995579aae877ac4a5619a1850d7ff36
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.4 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.4
index 2a33d4fb2961..7c411e292221 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtvirtualkeyboard-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=49b31a5f2eaa01b6ceee418f63b9e7c7
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.7.1 b/metadata/md5-cache/dev-qt/qtwayland-5.7.1
index 940c7331edda..e1fd157e15b0 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwayland-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9d7394a0dc477a8ba16c9719632e18e3
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.9.4 b/metadata/md5-cache/dev-qt/qtwayland-5.9.4
index 82f9790e3cf0..c5cc7af57c6b 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwayland-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f8203b85ce0071070b9ba8613f5fe48c
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.9.4-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.9.4-r1
index 15d581e191b5..a95d5fcf4f3e 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.9.4-r1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.9.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwayland-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=718584dfb9bb42feaa11c86151a23f43
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1 b/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
index 6bc4dc85334d..17432cd553f9 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebchannel-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e8a26835419fd5a3c1421c024f273e4b
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.4 b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.4
index b6649fe0a158..0bb8b9dc276a 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 qml? ( ~dev-qt/qtdeclarative-5.9.4 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebchannel-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=bbad63d1fb759b60dc37e081887099aa
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2 b/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
index eb9f8d4133d4..4bdb671f9190 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebengine-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=bdde4f1bce6bead538f7ddc4e00c8263
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.9.4 b/metadata/md5-cache/dev-qt/qtwebengine-5.9.4
index 172f50fe2714..4007cc5cbd75 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebengine-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6beda6570289b336910167f5aa5a7b42
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.7.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
index 7c8355aa3f1b..297c4cee8684 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 RESTRICT=mirror test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e9e52d8f9b3c33300a1761c12b5eee6a
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.9.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
index 4dcc90fc349a..68dabe8a5e82 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( gstreamer multimedia )
 RESTRICT=mirror test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=675068bc3ad1ecf755d14d9bc6ace647
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1 b/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
index 618a69ab439c..23aad837409d 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] qml? ( ~dev-qt/qtdecl
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebsockets-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9eb13718d8a7d4e451684d275bf2c83e
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.4 b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.4
index 9a41c7c06bae..8e86c18968a3 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4[ssl=] qml? ( ~dev-qt/qtdecl
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebsockets-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7d6ebe1b2d442aac1eb3d7881f0a3518
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.7.1 b/metadata/md5-cache/dev-qt/qtwebview-5.7.1
index 3c6e4a15d7c4..10ed8a109540 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebview-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=82697778ea3ac492e122861147c788ad
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.9.4 b/metadata/md5-cache/dev-qt/qtwebview-5.9.4
index 42ecd7c55b5a..811816b488cf 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtdeclarative-5.9.4 ~dev-qt/qtgui-5.9.4 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebview-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=78a32f1358129eac1a3540c0893f209d
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.7.1 b/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
index df4bc9438861..9c2d22fa79b2 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=,png=,xcb?] dev-qt/qtchoo
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6495bb5330a8f0e1ed3035e301a3178a
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.9.4-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.9.4-r1
index 25f9511bece2..a0825ef6e608 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.9.4-r1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.9.4-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[gles2=,png=,xcb?] gtk? ( ~dev-q
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=29c29be64a3194eacdf7ee06a92864fa
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.7.1 b/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
index 6e974b268352..36a6b9bc1162 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtx11extras-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ea23adca57db425b64a512f8402662a5
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.9.4 b/metadata/md5-cache/dev-qt/qtx11extras-5.9.4
index 6a95b61a5fa3..753b51089acb 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtgui-5.9.4[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtx11extras-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=3e5e873d10953f3d5fa517577a28c3aa
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.7.1 b/metadata/md5-cache/dev-qt/qtxml-5.7.1
index d63c85cab030..b08fef16499b 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtxml-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e6a031338a2cdc2ecba1dffe406860e7
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.9.4 b/metadata/md5-cache/dev-qt/qtxml-5.9.4
index 28ea4fc6f9be..0bdec12e3c23 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtxml-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=63f30197a12aff9bc58901f7159b8a74
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
index 12e793a7813a..51e2ae276a26 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtxmlpatterns-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a31e531e8991eb6f6300a579ffe9de6a
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.4 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.4
index 6f892b664517..0d2ce8eec0fa 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.4
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.4 ~dev-qt/qtnetwork-5.9.4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtxmlpatterns-opensource-src-5.9.4.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	75dcc2efd887ed1e9e7588cddfbbdd3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	a5513467d0bf6fc7650c5b13144a0e3b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=d680c76f73aae4ece50e319228cccbd7
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 8d30fa501111..91e6a5d44a62 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/facter-3.10.0 b/metadata/md5-cache/dev-ruby/facter-3.10.0
index 3d35e7519765..c1a92d42be64 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.10.0
+++ b/metadata/md5-cache/dev-ruby/facter-3.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=A cross-platform ruby library for retrieving facts from operating sy
 EAPI=6
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.10.0.tar.gz -> facter-3.10.0.tar.gz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ba7ca1a22b0ab5fe60884a6aba9f13b
+_md5_=872925d859b7e79d71864d2b5bc4de2a
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 283024eeb7c7..c453e924261a 100644
Binary files a/metadata/md5-cache/dev-texlive/Manifest.gz and b/metadata/md5-cache/dev-texlive/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1 b/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
index 108903a14195..c5a56ae869bd 100644
--- a/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
+++ b/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
@@ -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 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-1 GPL-2 LPPL-1.3 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-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsfonts-2017.tar.xz mirror://gentoo/texlive-module-bibtex-2017.tar.xz mirror://gentoo/texlive-module-cm-2017.tar.xz mirror://gentoo/texlive-module-enctex-2017.tar.xz mirror://gentoo/texlive-module-etex-2017.tar.xz mirror://gentoo/texlive-module-etex-pkg-2017.tar.xz mirror://gentoo/texlive-module-graphics-def-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8-2017.tar.xz mirror://gentoo/texlive-module-ifluatex-2017.tar.xz mirror://gentoo/texlive-module-ifxetex-2017.tar.xz mirror://gentoo/texlive-module-knuth-lib-2017.tar.xz mirror://gentoo/texlive-module-knuth-local-2017.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt-2017.tar.xz mirror://gentoo/texlive-module-luatex-2017.tar.xz mirror://gentoo/texlive-module-makeindex-2017.tar.xz mirror://gentoo/texlive-module-metafont-2017.tar.xz mirror://gentoo/texlive-module-mflogo-2017.tar.xz mirror://gentoo/texlive-module-mfware-2017.tar.xz mirror://gentoo/texlive-module-pdftex-2017.tar.xz mirror://gentoo/texlive-module-plain-2017.tar.xz mirror://gentoo/texlive-module-tex-2017.tar.xz mirror://gentoo/texlive-module-tex-ini-files-2017.tar.xz mirror://gentoo/texlive-module-texlive-common-2017.tar.xz mirror://gentoo/texlive-module-texlive-docindex-2017.tar.xz mirror://gentoo/texlive-module-texlive-en-2017.tar.xz mirror://gentoo/texlive-module-texlive-msg-translations-2017.tar.xz mirror://gentoo/texlive-module-texlive-scripts-2017.tar.xz mirror://gentoo/texlive-module-unicode-data-2017.tar.xz mirror://gentoo/texlive-module-updmap-map-2017.tar.xz mirror://gentoo/texlive-module-collection-basic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtex.doc-2017.tar.xz mirror://gentoo/texlive-module-cm.doc-2017.tar.xz mirror://gentoo/texlive-module-enctex.doc-2017.tar.xz mirror://gentoo/texlive-module-etex.doc-2017.tar.xz mirror://gentoo/texlive-module-etex-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-def.doc-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8.doc-2017.tar.xz mirror://gentoo/texlive-module-ifluatex.doc-2017.tar.xz mirror://gentoo/texlive-module-ifxetex.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt.doc-2017.tar.xz mirror://gentoo/texlive-module-luatex.doc-2017.tar.xz mirror://gentoo/texlive-module-makeindex.doc-2017.tar.xz mirror://gentoo/texlive-module-metafont.doc-2017.tar.xz mirror://gentoo/texlive-module-mflogo.doc-2017.tar.xz mirror://gentoo/texlive-module-mfware.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ini-files.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-common.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-docindex.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-en.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-scripts.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-data.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-amsfonts.source-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8.source-2017.tar.xz mirror://gentoo/texlive-module-ifluatex.source-2017.tar.xz mirror://gentoo/texlive-module-ifxetex.source-2017.tar.xz mirror://gentoo/texlive-module-mflogo.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d20c0292b242547c3c8f85a38ecc4555
+_md5_=8e5114f58ad898374a633e845584cb31
diff --git a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017 b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
index 9e84c45587da..4e123083ae0a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive BibTeX additional styles
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !=dev-texlive/texlive-latexextra-2007* !<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-publishers-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aichej-2017.tar.xz mirror://gentoo/texlive-module-ajl-2017.tar.xz mirror://gentoo/texlive-module-amsrefs-2017.tar.xz mirror://gentoo/texlive-module-apacite-2017.tar.xz mirror://gentoo/texlive-module-apalike2-2017.tar.xz mirror://gentoo/texlive-module-archaeologie-2017.tar.xz mirror://gentoo/texlive-module-beebe-2017.tar.xz mirror://gentoo/texlive-module-besjournals-2017.tar.xz mirror://gentoo/texlive-module-bestpapers-2017.tar.xz mirror://gentoo/texlive-module-bibarts-2017.tar.xz mirror://gentoo/texlive-module-biber-2017.tar.xz mirror://gentoo/texlive-module-bibexport-2017.tar.xz mirror://gentoo/texlive-module-bibhtml-2017.tar.xz mirror://gentoo/texlive-module-biblatex-abnt-2017.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous-2017.tar.xz mirror://gentoo/texlive-module-biblatex-apa-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology-2017.tar.xz mirror://gentoo/texlive-module-biblatex-arthistory-bonn-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bwl-2017.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chem-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chicago-2017.tar.xz mirror://gentoo/texlive-module-biblatex-claves-2017.tar.xz mirror://gentoo/texlive-module-biblatex-dw-2017.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gost-2017.tar.xz mirror://gentoo/texlive-module-biblatex-historian-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ieee-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra-2017.tar.xz mirror://gentoo/texlive-module-biblatex-iso690-2017.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss-2017.tar.xz mirror://gentoo/texlive-module-biblatex-lni-2017.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw-2017.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology-2017.tar.xz mirror://gentoo/texlive-module-biblatex-mla-2017.tar.xz mirror://gentoo/texlive-module-biblatex-morenames-2017.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm-2017.tar.xz mirror://gentoo/texlive-module-biblatex-musuos-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nature-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nejm-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic-2017.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy-2017.tar.xz mirror://gentoo/texlive-module-biblatex-phys-2017.tar.xz mirror://gentoo/texlive-module-biblatex-publist-2017.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor-2017.tar.xz mirror://gentoo/texlive-module-biblatex-sbl-2017.tar.xz mirror://gentoo/texlive-module-biblatex-science-2017.tar.xz mirror://gentoo/texlive-module-biblatex-shortfields-2017.tar.xz mirror://gentoo/texlive-module-biblatex-source-division-2017.tar.xz mirror://gentoo/texlive-module-biblatex-subseries-2017.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal-2017.tar.xz mirror://gentoo/texlive-module-biblatex-trad-2017.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit-2017.tar.xz mirror://gentoo/texlive-module-biblist-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs-2017.tar.xz mirror://gentoo/texlive-module-bibtopic-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix-2017.tar.xz mirror://gentoo/texlive-module-bibunits-2017.tar.xz mirror://gentoo/texlive-module-biolett-bst-2017.tar.xz mirror://gentoo/texlive-module-bookdb-2017.tar.xz mirror://gentoo/texlive-module-breakcites-2017.tar.xz mirror://gentoo/texlive-module-cell-2017.tar.xz mirror://gentoo/texlive-module-chbibref-2017.tar.xz mirror://gentoo/texlive-module-chicago-2017.tar.xz mirror://gentoo/texlive-module-chicago-annote-2017.tar.xz mirror://gentoo/texlive-module-chembst-2017.tar.xz mirror://gentoo/texlive-module-chscite-2017.tar.xz mirror://gentoo/texlive-module-citeall-2017.tar.xz mirror://gentoo/texlive-module-collref-2017.tar.xz mirror://gentoo/texlive-module-compactbib-2017.tar.xz mirror://gentoo/texlive-module-crossrefware-2017.tar.xz mirror://gentoo/texlive-module-custom-bib-2017.tar.xz mirror://gentoo/texlive-module-din1505-2017.tar.xz mirror://gentoo/texlive-module-dk-bib-2017.tar.xz mirror://gentoo/texlive-module-doipubmed-2017.tar.xz mirror://gentoo/texlive-module-ecobiblatex-2017.tar.xz mirror://gentoo/texlive-module-economic-2017.tar.xz mirror://gentoo/texlive-module-fbs-2017.tar.xz mirror://gentoo/texlive-module-figbib-2017.tar.xz mirror://gentoo/texlive-module-footbib-2017.tar.xz mirror://gentoo/texlive-module-francais-bst-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl-2017.tar.xz mirror://gentoo/texlive-module-harvard-2017.tar.xz mirror://gentoo/texlive-module-harvmac-2017.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift-2017.tar.xz mirror://gentoo/texlive-module-ietfbibs-2017.tar.xz mirror://gentoo/texlive-module-ijqc-2017.tar.xz mirror://gentoo/texlive-module-inlinebib-2017.tar.xz mirror://gentoo/texlive-module-iopart-num-2017.tar.xz mirror://gentoo/texlive-module-jneurosci-2017.tar.xz mirror://gentoo/texlive-module-jurabib-2017.tar.xz mirror://gentoo/texlive-module-ksfh_nat-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib-2017.tar.xz mirror://gentoo/texlive-module-listbib-2017.tar.xz mirror://gentoo/texlive-module-logreq-2017.tar.xz mirror://gentoo/texlive-module-margbib-2017.tar.xz mirror://gentoo/texlive-module-multibib-2017.tar.xz mirror://gentoo/texlive-module-multibibliography-2017.tar.xz mirror://gentoo/texlive-module-munich-2017.tar.xz mirror://gentoo/texlive-module-nar-2017.tar.xz mirror://gentoo/texlive-module-nmbib-2017.tar.xz mirror://gentoo/texlive-module-notes2bib-2017.tar.xz mirror://gentoo/texlive-module-notex-bst-2017.tar.xz mirror://gentoo/texlive-module-oscola-2017.tar.xz mirror://gentoo/texlive-module-perception-2017.tar.xz mirror://gentoo/texlive-module-pnas2009-2017.tar.xz mirror://gentoo/texlive-module-rsc-2017.tar.xz mirror://gentoo/texlive-module-showtags-2017.tar.xz mirror://gentoo/texlive-module-sort-by-letters-2017.tar.xz mirror://gentoo/texlive-module-splitbib-2017.tar.xz mirror://gentoo/texlive-module-turabian-formatting-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin-2017.tar.xz mirror://gentoo/texlive-module-urlbst-2017.tar.xz mirror://gentoo/texlive-module-usebib-2017.tar.xz mirror://gentoo/texlive-module-vak-2017.tar.xz mirror://gentoo/texlive-module-xcite-2017.tar.xz mirror://gentoo/texlive-module-collection-bibtexextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsrefs.doc-2017.tar.xz mirror://gentoo/texlive-module-apacite.doc-2017.tar.xz mirror://gentoo/texlive-module-archaeologie.doc-2017.tar.xz mirror://gentoo/texlive-module-besjournals.doc-2017.tar.xz mirror://gentoo/texlive-module-bestpapers.doc-2017.tar.xz mirror://gentoo/texlive-module-bibarts.doc-2017.tar.xz mirror://gentoo/texlive-module-biber.doc-2017.tar.xz mirror://gentoo/texlive-module-bibexport.doc-2017.tar.xz mirror://gentoo/texlive-module-bibhtml.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-abnt.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-apa.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-arthistory-bonn.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bwl.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chem.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chicago.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-claves.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-dw.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gost.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-historian.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ieee.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-iso690.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-lni.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-mla.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-morenames.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-musuos.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nature.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nejm.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-phys.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-publist.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-sbl.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-science.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-shortfields.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-source-division.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-subseries.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-trad.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit.doc-2017.tar.xz mirror://gentoo/texlive-module-biblist.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtopic.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.doc-2017.tar.xz mirror://gentoo/texlive-module-bibunits.doc-2017.tar.xz mirror://gentoo/texlive-module-biolett-bst.doc-2017.tar.xz mirror://gentoo/texlive-module-bookdb.doc-2017.tar.xz mirror://gentoo/texlive-module-breakcites.doc-2017.tar.xz mirror://gentoo/texlive-module-cell.doc-2017.tar.xz mirror://gentoo/texlive-module-chbibref.doc-2017.tar.xz mirror://gentoo/texlive-module-chicago-annote.doc-2017.tar.xz mirror://gentoo/texlive-module-chembst.doc-2017.tar.xz mirror://gentoo/texlive-module-chscite.doc-2017.tar.xz mirror://gentoo/texlive-module-citeall.doc-2017.tar.xz mirror://gentoo/texlive-module-collref.doc-2017.tar.xz mirror://gentoo/texlive-module-crossrefware.doc-2017.tar.xz mirror://gentoo/texlive-module-custom-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-din1505.doc-2017.tar.xz mirror://gentoo/texlive-module-dk-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-doipubmed.doc-2017.tar.xz mirror://gentoo/texlive-module-ecobiblatex.doc-2017.tar.xz mirror://gentoo/texlive-module-economic.doc-2017.tar.xz mirror://gentoo/texlive-module-figbib.doc-2017.tar.xz mirror://gentoo/texlive-module-footbib.doc-2017.tar.xz mirror://gentoo/texlive-module-francais-bst.doc-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.doc-2017.tar.xz mirror://gentoo/texlive-module-harvard.doc-2017.tar.xz mirror://gentoo/texlive-module-harvmac.doc-2017.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift.doc-2017.tar.xz mirror://gentoo/texlive-module-ietfbibs.doc-2017.tar.xz mirror://gentoo/texlive-module-ijqc.doc-2017.tar.xz mirror://gentoo/texlive-module-inlinebib.doc-2017.tar.xz mirror://gentoo/texlive-module-iopart-num.doc-2017.tar.xz mirror://gentoo/texlive-module-jneurosci.doc-2017.tar.xz mirror://gentoo/texlive-module-jurabib.doc-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib.doc-2017.tar.xz mirror://gentoo/texlive-module-listbib.doc-2017.tar.xz mirror://gentoo/texlive-module-logreq.doc-2017.tar.xz mirror://gentoo/texlive-module-margbib.doc-2017.tar.xz mirror://gentoo/texlive-module-multibib.doc-2017.tar.xz mirror://gentoo/texlive-module-multibibliography.doc-2017.tar.xz mirror://gentoo/texlive-module-munich.doc-2017.tar.xz mirror://gentoo/texlive-module-nmbib.doc-2017.tar.xz mirror://gentoo/texlive-module-notes2bib.doc-2017.tar.xz mirror://gentoo/texlive-module-oscola.doc-2017.tar.xz mirror://gentoo/texlive-module-perception.doc-2017.tar.xz mirror://gentoo/texlive-module-rsc.doc-2017.tar.xz mirror://gentoo/texlive-module-showtags.doc-2017.tar.xz mirror://gentoo/texlive-module-sort-by-letters.doc-2017.tar.xz mirror://gentoo/texlive-module-splitbib.doc-2017.tar.xz mirror://gentoo/texlive-module-turabian-formatting.doc-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger.doc-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin.doc-2017.tar.xz mirror://gentoo/texlive-module-urlbst.doc-2017.tar.xz mirror://gentoo/texlive-module-usebib.doc-2017.tar.xz mirror://gentoo/texlive-module-vak.doc-2017.tar.xz mirror://gentoo/texlive-module-xcite.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-amsrefs.source-2017.tar.xz mirror://gentoo/texlive-module-apacite.source-2017.tar.xz mirror://gentoo/texlive-module-bibarts.source-2017.tar.xz mirror://gentoo/texlive-module-biber.source-2017.tar.xz mirror://gentoo/texlive-module-bibexport.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.source-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.source-2017.tar.xz mirror://gentoo/texlive-module-bibtopic.source-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.source-2017.tar.xz mirror://gentoo/texlive-module-bibunits.source-2017.tar.xz mirror://gentoo/texlive-module-chembst.source-2017.tar.xz mirror://gentoo/texlive-module-chscite.source-2017.tar.xz mirror://gentoo/texlive-module-collref.source-2017.tar.xz mirror://gentoo/texlive-module-custom-bib.source-2017.tar.xz mirror://gentoo/texlive-module-dk-bib.source-2017.tar.xz mirror://gentoo/texlive-module-doipubmed.source-2017.tar.xz mirror://gentoo/texlive-module-footbib.source-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.source-2017.tar.xz mirror://gentoo/texlive-module-harvard.source-2017.tar.xz mirror://gentoo/texlive-module-jurabib.source-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib.source-2017.tar.xz mirror://gentoo/texlive-module-listbib.source-2017.tar.xz mirror://gentoo/texlive-module-margbib.source-2017.tar.xz mirror://gentoo/texlive-module-multibib.source-2017.tar.xz mirror://gentoo/texlive-module-multibibliography.source-2017.tar.xz mirror://gentoo/texlive-module-nmbib.source-2017.tar.xz mirror://gentoo/texlive-module-notes2bib.source-2017.tar.xz mirror://gentoo/texlive-module-rsc.source-2017.tar.xz mirror://gentoo/texlive-module-splitbib.source-2017.tar.xz mirror://gentoo/texlive-module-urlbst.source-2017.tar.xz mirror://gentoo/texlive-module-usebib.source-2017.tar.xz mirror://gentoo/texlive-module-xcite.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee2380e53a7478974014c0cd1e35ec59
+_md5_=5c67a206946e36909d33b09c1d61d9f1
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2017 b/metadata/md5-cache/dev-texlive/texlive-context-2017
index 4cbba6297741..b0bb5386bf8c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-context-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive ConTeXt and packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=BSD GPL-1 GPL-2 GPL-3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=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-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-context-2017.tar.xz mirror://gentoo/texlive-module-jmn-2017.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-context-account-2017.tar.xz mirror://gentoo/texlive-module-context-algorithmic-2017.tar.xz mirror://gentoo/texlive-module-context-animation-2017.tar.xz mirror://gentoo/texlive-module-context-annotation-2017.tar.xz mirror://gentoo/texlive-module-context-bnf-2017.tar.xz mirror://gentoo/texlive-module-context-chromato-2017.tar.xz mirror://gentoo/texlive-module-context-cmscbf-2017.tar.xz mirror://gentoo/texlive-module-context-cmttbf-2017.tar.xz mirror://gentoo/texlive-module-context-construction-plan-2017.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers-2017.tar.xz mirror://gentoo/texlive-module-context-degrade-2017.tar.xz mirror://gentoo/texlive-module-context-fancybreak-2017.tar.xz mirror://gentoo/texlive-module-context-filter-2017.tar.xz mirror://gentoo/texlive-module-context-french-2017.tar.xz mirror://gentoo/texlive-module-context-fullpage-2017.tar.xz mirror://gentoo/texlive-module-context-gantt-2017.tar.xz mirror://gentoo/texlive-module-context-gnuplot-2017.tar.xz mirror://gentoo/texlive-module-context-inifile-2017.tar.xz mirror://gentoo/texlive-module-context-layout-2017.tar.xz mirror://gentoo/texlive-module-context-letter-2017.tar.xz mirror://gentoo/texlive-module-context-lettrine-2017.tar.xz mirror://gentoo/texlive-module-context-mathsets-2017.tar.xz mirror://gentoo/texlive-module-context-rst-2017.tar.xz mirror://gentoo/texlive-module-context-ruby-2017.tar.xz mirror://gentoo/texlive-module-context-simplefonts-2017.tar.xz mirror://gentoo/texlive-module-context-simpleslides-2017.tar.xz mirror://gentoo/texlive-module-context-title-2017.tar.xz mirror://gentoo/texlive-module-context-transliterator-2017.tar.xz mirror://gentoo/texlive-module-context-typearea-2017.tar.xz mirror://gentoo/texlive-module-context-typescripts-2017.tar.xz mirror://gentoo/texlive-module-context-vim-2017.tar.xz mirror://gentoo/texlive-module-context-visualcounter-2017.tar.xz mirror://gentoo/texlive-module-collection-context-2017.tar.xz doc? ( mirror://gentoo/texlive-module-context.doc-2017.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-context-account.doc-2017.tar.xz mirror://gentoo/texlive-module-context-animation.doc-2017.tar.xz mirror://gentoo/texlive-module-context-annotation.doc-2017.tar.xz mirror://gentoo/texlive-module-context-bnf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-chromato.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cmscbf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cmttbf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-construction-plan.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-context-degrade.doc-2017.tar.xz mirror://gentoo/texlive-module-context-fancybreak.doc-2017.tar.xz mirror://gentoo/texlive-module-context-filter.doc-2017.tar.xz mirror://gentoo/texlive-module-context-french.doc-2017.tar.xz mirror://gentoo/texlive-module-context-fullpage.doc-2017.tar.xz mirror://gentoo/texlive-module-context-gantt.doc-2017.tar.xz mirror://gentoo/texlive-module-context-gnuplot.doc-2017.tar.xz mirror://gentoo/texlive-module-context-inifile.doc-2017.tar.xz mirror://gentoo/texlive-module-context-layout.doc-2017.tar.xz mirror://gentoo/texlive-module-context-letter.doc-2017.tar.xz mirror://gentoo/texlive-module-context-lettrine.doc-2017.tar.xz mirror://gentoo/texlive-module-context-mathsets.doc-2017.tar.xz mirror://gentoo/texlive-module-context-rst.doc-2017.tar.xz mirror://gentoo/texlive-module-context-ruby.doc-2017.tar.xz mirror://gentoo/texlive-module-context-simplefonts.doc-2017.tar.xz mirror://gentoo/texlive-module-context-simpleslides.doc-2017.tar.xz mirror://gentoo/texlive-module-context-title.doc-2017.tar.xz mirror://gentoo/texlive-module-context-transliterator.doc-2017.tar.xz mirror://gentoo/texlive-module-context-typearea.doc-2017.tar.xz mirror://gentoo/texlive-module-context-typescripts.doc-2017.tar.xz mirror://gentoo/texlive-module-context-vim.doc-2017.tar.xz mirror://gentoo/texlive-module-context-visualcounter.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-context-visualcounter.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3bcaefc8e86e425042d7e21aaf8a4838
+_md5_=6c5e81cd331a58745075799bf45b38d5
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017 b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
index 714f678e5ddc..b3216619f675 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Additional fonts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=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-2017 !=dev-texlive/texlive-langpolish-2007* !<dev-texlive/texlive-latexextra-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-Asana-Math-2017.tar.xz mirror://gentoo/texlive-module-academicons-2017.tar.xz mirror://gentoo/texlive-module-accanthis-2017.tar.xz mirror://gentoo/texlive-module-adforn-2017.tar.xz mirror://gentoo/texlive-module-adfsymbols-2017.tar.xz mirror://gentoo/texlive-module-aecc-2017.tar.xz mirror://gentoo/texlive-module-alegreya-2017.tar.xz mirror://gentoo/texlive-module-allrunes-2017.tar.xz mirror://gentoo/texlive-module-almfixed-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro-2017.tar.xz mirror://gentoo/texlive-module-antiqua-2017.tar.xz mirror://gentoo/texlive-module-antt-2017.tar.xz mirror://gentoo/texlive-module-archaic-2017.tar.xz mirror://gentoo/texlive-module-arev-2017.tar.xz mirror://gentoo/texlive-module-arimo-2017.tar.xz mirror://gentoo/texlive-module-asapsym-2017.tar.xz mirror://gentoo/texlive-module-ascii-font-2017.tar.xz mirror://gentoo/texlive-module-aspectratio-2017.tar.xz mirror://gentoo/texlive-module-astro-2017.tar.xz mirror://gentoo/texlive-module-augie-2017.tar.xz mirror://gentoo/texlive-module-auncial-new-2017.tar.xz mirror://gentoo/texlive-module-aurical-2017.tar.xz mirror://gentoo/texlive-module-b1encoding-2017.tar.xz mirror://gentoo/texlive-module-barcodes-2017.tar.xz mirror://gentoo/texlive-module-baskervald-2017.tar.xz mirror://gentoo/texlive-module-baskervaldx-2017.tar.xz mirror://gentoo/texlive-module-baskervillef-2017.tar.xz mirror://gentoo/texlive-module-bbding-2017.tar.xz mirror://gentoo/texlive-module-bbm-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros-2017.tar.xz mirror://gentoo/texlive-module-bbold-2017.tar.xz mirror://gentoo/texlive-module-bbold-type1-2017.tar.xz mirror://gentoo/texlive-module-belleek-2017.tar.xz mirror://gentoo/texlive-module-bera-2017.tar.xz mirror://gentoo/texlive-module-berenisadf-2017.tar.xz mirror://gentoo/texlive-module-beuron-2017.tar.xz mirror://gentoo/texlive-module-bguq-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1-2017.tar.xz mirror://gentoo/texlive-module-boisik-2017.tar.xz mirror://gentoo/texlive-module-bookhands-2017.tar.xz mirror://gentoo/texlive-module-boondox-2017.tar.xz mirror://gentoo/texlive-module-braille-2017.tar.xz mirror://gentoo/texlive-module-brushscr-2017.tar.xz mirror://gentoo/texlive-module-cabin-2017.tar.xz mirror://gentoo/texlive-module-caladea-2017.tar.xz mirror://gentoo/texlive-module-calligra-2017.tar.xz mirror://gentoo/texlive-module-calligra-type1-2017.tar.xz mirror://gentoo/texlive-module-cantarell-2017.tar.xz mirror://gentoo/texlive-module-carlito-2017.tar.xz mirror://gentoo/texlive-module-carolmin-ps-2017.tar.xz mirror://gentoo/texlive-module-ccicons-2017.tar.xz mirror://gentoo/texlive-module-cfr-initials-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm-2017.tar.xz mirror://gentoo/texlive-module-cherokee-2017.tar.xz mirror://gentoo/texlive-module-chivo-2017.tar.xz mirror://gentoo/texlive-module-cinzel-2017.tar.xz mirror://gentoo/texlive-module-clearsans-2017.tar.xz mirror://gentoo/texlive-module-cm-lgc-2017.tar.xz mirror://gentoo/texlive-module-cm-unicode-2017.tar.xz mirror://gentoo/texlive-module-cmbright-2017.tar.xz mirror://gentoo/texlive-module-cmexb-2017.tar.xz mirror://gentoo/texlive-module-cmll-2017.tar.xz mirror://gentoo/texlive-module-cmpica-2017.tar.xz mirror://gentoo/texlive-module-cmtiup-2017.tar.xz mirror://gentoo/texlive-module-cochineal-2017.tar.xz mirror://gentoo/texlive-module-comfortaa-2017.tar.xz mirror://gentoo/texlive-module-comicneue-2017.tar.xz mirror://gentoo/texlive-module-concmath-fonts-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols-2017.tar.xz mirror://gentoo/texlive-module-cormorantgaramond-2017.tar.xz mirror://gentoo/texlive-module-countriesofeurope-2017.tar.xz mirror://gentoo/texlive-module-courier-scaled-2017.tar.xz mirror://gentoo/texlive-module-crimson-2017.tar.xz mirror://gentoo/texlive-module-cryst-2017.tar.xz mirror://gentoo/texlive-module-cyklop-2017.tar.xz mirror://gentoo/texlive-module-dancers-2017.tar.xz mirror://gentoo/texlive-module-dantelogo-2017.tar.xz mirror://gentoo/texlive-module-dejavu-2017.tar.xz mirror://gentoo/texlive-module-dice-2017.tar.xz mirror://gentoo/texlive-module-dictsym-2017.tar.xz mirror://gentoo/texlive-module-dingbat-2017.tar.xz mirror://gentoo/texlive-module-doublestroke-2017.tar.xz mirror://gentoo/texlive-module-dozenal-2017.tar.xz mirror://gentoo/texlive-module-drm-2017.tar.xz mirror://gentoo/texlive-module-droid-2017.tar.xz mirror://gentoo/texlive-module-duerer-2017.tar.xz mirror://gentoo/texlive-module-duerer-latex-2017.tar.xz mirror://gentoo/texlive-module-dutchcal-2017.tar.xz mirror://gentoo/texlive-module-ean-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths-2017.tar.xz mirror://gentoo/texlive-module-ecc-2017.tar.xz mirror://gentoo/texlive-module-eco-2017.tar.xz mirror://gentoo/texlive-module-eiad-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx-2017.tar.xz mirror://gentoo/texlive-module-electrum-2017.tar.xz mirror://gentoo/texlive-module-elvish-2017.tar.xz mirror://gentoo/texlive-module-epigrafica-2017.tar.xz mirror://gentoo/texlive-module-epsdice-2017.tar.xz mirror://gentoo/texlive-module-erewhon-2017.tar.xz mirror://gentoo/texlive-module-esrelation-2017.tar.xz mirror://gentoo/texlive-module-esstix-2017.tar.xz mirror://gentoo/texlive-module-esvect-2017.tar.xz mirror://gentoo/texlive-module-eulervm-2017.tar.xz mirror://gentoo/texlive-module-euxm-2017.tar.xz mirror://gentoo/texlive-module-fbb-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol-2017.tar.xz mirror://gentoo/texlive-module-fetamont-2017.tar.xz mirror://gentoo/texlive-module-feyn-2017.tar.xz mirror://gentoo/texlive-module-fge-2017.tar.xz mirror://gentoo/texlive-module-fira-2017.tar.xz mirror://gentoo/texlive-module-foekfont-2017.tar.xz mirror://gentoo/texlive-module-fonetika-2017.tar.xz mirror://gentoo/texlive-module-fontawesome-2017.tar.xz mirror://gentoo/texlive-module-fontmfizz-2017.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-fourier-2017.tar.xz mirror://gentoo/texlive-module-fouriernc-2017.tar.xz mirror://gentoo/texlive-module-frcursive-2017.tar.xz mirror://gentoo/texlive-module-frederika2016-2017.tar.xz mirror://gentoo/texlive-module-genealogy-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug-2017.tar.xz mirror://gentoo/texlive-module-gfsartemisia-2017.tar.xz mirror://gentoo/texlive-module-gfsbodoni-2017.tar.xz mirror://gentoo/texlive-module-gfscomplutum-2017.tar.xz mirror://gentoo/texlive-module-gfsdidot-2017.tar.xz mirror://gentoo/texlive-module-gfsneohellenic-2017.tar.xz mirror://gentoo/texlive-module-gfssolomos-2017.tar.xz mirror://gentoo/texlive-module-gillcm-2017.tar.xz mirror://gentoo/texlive-module-gillius-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont-2017.tar.xz mirror://gentoo/texlive-module-gofonts-2017.tar.xz mirror://gentoo/texlive-module-gothic-2017.tar.xz mirror://gentoo/texlive-module-greenpoint-2017.tar.xz mirror://gentoo/texlive-module-grotesq-2017.tar.xz mirror://gentoo/texlive-module-hacm-2017.tar.xz mirror://gentoo/texlive-module-hands-2017.tar.xz mirror://gentoo/texlive-module-heuristica-2017.tar.xz mirror://gentoo/texlive-module-hfbright-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty-2017.tar.xz mirror://gentoo/texlive-module-ifsym-2017.tar.xz mirror://gentoo/texlive-module-imfellenglish-2017.tar.xz mirror://gentoo/texlive-module-inconsolata-2017.tar.xz mirror://gentoo/texlive-module-initials-2017.tar.xz mirror://gentoo/texlive-module-ipaex-type1-2017.tar.xz mirror://gentoo/texlive-module-iwona-2017.tar.xz mirror://gentoo/texlive-module-jablantile-2017.tar.xz mirror://gentoo/texlive-module-jamtimes-2017.tar.xz mirror://gentoo/texlive-module-junicode-2017.tar.xz mirror://gentoo/texlive-module-kixfont-2017.tar.xz mirror://gentoo/texlive-module-knuthotherfonts-2017.tar.xz mirror://gentoo/texlive-module-kpfonts-2017.tar.xz mirror://gentoo/texlive-module-kurier-2017.tar.xz mirror://gentoo/texlive-module-lato-2017.tar.xz mirror://gentoo/texlive-module-lfb-2017.tar.xz mirror://gentoo/texlive-module-libertine-2017.tar.xz mirror://gentoo/texlive-module-libertinegc-2017.tar.xz mirror://gentoo/texlive-module-libertinus-2017.tar.xz mirror://gentoo/texlive-module-libertinust1math-2017.tar.xz mirror://gentoo/texlive-module-librebaskerville-2017.tar.xz mirror://gentoo/texlive-module-librebodoni-2017.tar.xz mirror://gentoo/texlive-module-librecaslon-2017.tar.xz mirror://gentoo/texlive-module-libris-2017.tar.xz mirror://gentoo/texlive-module-linearA-2017.tar.xz mirror://gentoo/texlive-module-lobster2-2017.tar.xz mirror://gentoo/texlive-module-lxfonts-2017.tar.xz mirror://gentoo/texlive-module-ly1-2017.tar.xz mirror://gentoo/texlive-module-mathabx-2017.tar.xz mirror://gentoo/texlive-module-mathabx-type1-2017.tar.xz mirror://gentoo/texlive-module-mathdesign-2017.tar.xz mirror://gentoo/texlive-module-mdputu-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol-2017.tar.xz mirror://gentoo/texlive-module-merriweather-2017.tar.xz mirror://gentoo/texlive-module-miama-2017.tar.xz mirror://gentoo/texlive-module-mintspirit-2017.tar.xz mirror://gentoo/texlive-module-missaali-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol-2017.tar.xz mirror://gentoo/texlive-module-montserrat-2017.tar.xz mirror://gentoo/texlive-module-mweights-2017.tar.xz mirror://gentoo/texlive-module-newpx-2017.tar.xz mirror://gentoo/texlive-module-newtx-2017.tar.xz mirror://gentoo/texlive-module-newtxsf-2017.tar.xz mirror://gentoo/texlive-module-newtxtt-2017.tar.xz mirror://gentoo/texlive-module-nimbus15-2017.tar.xz mirror://gentoo/texlive-module-nkarta-2017.tar.xz mirror://gentoo/texlive-module-noto-2017.tar.xz mirror://gentoo/texlive-module-obnov-2017.tar.xz mirror://gentoo/texlive-module-ocherokee-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline-2017.tar.xz mirror://gentoo/texlive-module-ogham-2017.tar.xz mirror://gentoo/texlive-module-oinuit-2017.tar.xz mirror://gentoo/texlive-module-old-arrows-2017.tar.xz mirror://gentoo/texlive-module-oldlatin-2017.tar.xz mirror://gentoo/texlive-module-oldstandard-2017.tar.xz mirror://gentoo/texlive-module-opensans-2017.tar.xz mirror://gentoo/texlive-module-orkhun-2017.tar.xz mirror://gentoo/texlive-module-overlock-2017.tar.xz mirror://gentoo/texlive-module-pacioli-2017.tar.xz mirror://gentoo/texlive-module-paratype-2017.tar.xz mirror://gentoo/texlive-module-phaistos-2017.tar.xz mirror://gentoo/texlive-module-phonetic-2017.tar.xz mirror://gentoo/texlive-module-pigpen-2017.tar.xz mirror://gentoo/texlive-module-playfair-2017.tar.xz mirror://gentoo/texlive-module-poltawski-2017.tar.xz mirror://gentoo/texlive-module-prodint-2017.tar.xz mirror://gentoo/texlive-module-punk-2017.tar.xz mirror://gentoo/texlive-module-punk-latex-2017.tar.xz mirror://gentoo/texlive-module-punknova-2017.tar.xz mirror://gentoo/texlive-module-pxtxalfa-2017.tar.xz mirror://gentoo/texlive-module-quattrocento-2017.tar.xz mirror://gentoo/texlive-module-raleway-2017.tar.xz mirror://gentoo/texlive-module-recycle-2017.tar.xz mirror://gentoo/texlive-module-roboto-2017.tar.xz mirror://gentoo/texlive-module-romande-2017.tar.xz mirror://gentoo/texlive-module-rosario-2017.tar.xz mirror://gentoo/texlive-module-rsfso-2017.tar.xz mirror://gentoo/texlive-module-sansmathaccent-2017.tar.xz mirror://gentoo/texlive-module-sansmathfonts-2017.tar.xz mirror://gentoo/texlive-module-sauter-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts-2017.tar.xz mirror://gentoo/texlive-module-schulschriften-2017.tar.xz mirror://gentoo/texlive-module-semaphor-2017.tar.xz mirror://gentoo/texlive-module-skull-2017.tar.xz mirror://gentoo/texlive-module-sourcecodepro-2017.tar.xz mirror://gentoo/texlive-module-sourcesanspro-2017.tar.xz mirror://gentoo/texlive-module-sourceserifpro-2017.tar.xz mirror://gentoo/texlive-module-starfont-2017.tar.xz mirror://gentoo/texlive-module-staves-2017.tar.xz mirror://gentoo/texlive-module-stix-2017.tar.xz mirror://gentoo/texlive-module-superiors-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols-2017.tar.xz mirror://gentoo/texlive-module-tapir-2017.tar.xz mirror://gentoo/texlive-module-tempora-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript-2017.tar.xz mirror://gentoo/texlive-module-tfrupee-2017.tar.xz mirror://gentoo/texlive-module-tinos-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts-2017.tar.xz mirror://gentoo/texlive-module-trajan-2017.tar.xz mirror://gentoo/texlive-module-txfontsb-2017.tar.xz mirror://gentoo/texlive-module-txuprcal-2017.tar.xz mirror://gentoo/texlive-module-typicons-2017.tar.xz mirror://gentoo/texlive-module-umtypewriter-2017.tar.xz mirror://gentoo/texlive-module-universa-2017.tar.xz mirror://gentoo/texlive-module-universalis-2017.tar.xz mirror://gentoo/texlive-module-uppunctlm-2017.tar.xz mirror://gentoo/texlive-module-urwchancal-2017.tar.xz mirror://gentoo/texlive-module-venturisadf-2017.tar.xz mirror://gentoo/texlive-module-wsuipa-2017.tar.xz mirror://gentoo/texlive-module-xcharter-2017.tar.xz mirror://gentoo/texlive-module-xits-2017.tar.xz mirror://gentoo/texlive-module-yfonts-2017.tar.xz mirror://gentoo/texlive-module-yfonts-t1-2017.tar.xz mirror://gentoo/texlive-module-yinit-otf-2017.tar.xz mirror://gentoo/texlive-module-zlmtt-2017.tar.xz mirror://gentoo/texlive-module-collection-fontsextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-Asana-Math.doc-2017.tar.xz mirror://gentoo/texlive-module-academicons.doc-2017.tar.xz mirror://gentoo/texlive-module-accanthis.doc-2017.tar.xz mirror://gentoo/texlive-module-adforn.doc-2017.tar.xz mirror://gentoo/texlive-module-adfsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-aecc.doc-2017.tar.xz mirror://gentoo/texlive-module-alegreya.doc-2017.tar.xz mirror://gentoo/texlive-module-allrunes.doc-2017.tar.xz mirror://gentoo/texlive-module-almfixed.doc-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro.doc-2017.tar.xz mirror://gentoo/texlive-module-antiqua.doc-2017.tar.xz mirror://gentoo/texlive-module-antt.doc-2017.tar.xz mirror://gentoo/texlive-module-archaic.doc-2017.tar.xz mirror://gentoo/texlive-module-arev.doc-2017.tar.xz mirror://gentoo/texlive-module-arimo.doc-2017.tar.xz mirror://gentoo/texlive-module-asapsym.doc-2017.tar.xz mirror://gentoo/texlive-module-ascii-font.doc-2017.tar.xz mirror://gentoo/texlive-module-aspectratio.doc-2017.tar.xz mirror://gentoo/texlive-module-astro.doc-2017.tar.xz mirror://gentoo/texlive-module-augie.doc-2017.tar.xz mirror://gentoo/texlive-module-auncial-new.doc-2017.tar.xz mirror://gentoo/texlive-module-aurical.doc-2017.tar.xz mirror://gentoo/texlive-module-b1encoding.doc-2017.tar.xz mirror://gentoo/texlive-module-barcodes.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervald.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervaldx.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervillef.doc-2017.tar.xz mirror://gentoo/texlive-module-bbding.doc-2017.tar.xz mirror://gentoo/texlive-module-bbm.doc-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros.doc-2017.tar.xz mirror://gentoo/texlive-module-bbold.doc-2017.tar.xz mirror://gentoo/texlive-module-bbold-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-belleek.doc-2017.tar.xz mirror://gentoo/texlive-module-bera.doc-2017.tar.xz mirror://gentoo/texlive-module-berenisadf.doc-2017.tar.xz mirror://gentoo/texlive-module-beuron.doc-2017.tar.xz mirror://gentoo/texlive-module-bguq.doc-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1.doc-2017.tar.xz mirror://gentoo/texlive-module-boisik.doc-2017.tar.xz mirror://gentoo/texlive-module-bookhands.doc-2017.tar.xz mirror://gentoo/texlive-module-boondox.doc-2017.tar.xz mirror://gentoo/texlive-module-braille.doc-2017.tar.xz mirror://gentoo/texlive-module-brushscr.doc-2017.tar.xz mirror://gentoo/texlive-module-cabin.doc-2017.tar.xz mirror://gentoo/texlive-module-caladea.doc-2017.tar.xz mirror://gentoo/texlive-module-calligra.doc-2017.tar.xz mirror://gentoo/texlive-module-calligra-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-cantarell.doc-2017.tar.xz mirror://gentoo/texlive-module-carlito.doc-2017.tar.xz mirror://gentoo/texlive-module-carolmin-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-ccicons.doc-2017.tar.xz mirror://gentoo/texlive-module-cfr-initials.doc-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm.doc-2017.tar.xz mirror://gentoo/texlive-module-cherokee.doc-2017.tar.xz mirror://gentoo/texlive-module-chivo.doc-2017.tar.xz mirror://gentoo/texlive-module-cinzel.doc-2017.tar.xz mirror://gentoo/texlive-module-clearsans.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-lgc.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-unicode.doc-2017.tar.xz mirror://gentoo/texlive-module-cmbright.doc-2017.tar.xz mirror://gentoo/texlive-module-cmexb.doc-2017.tar.xz mirror://gentoo/texlive-module-cmll.doc-2017.tar.xz mirror://gentoo/texlive-module-cmpica.doc-2017.tar.xz mirror://gentoo/texlive-module-cmtiup.doc-2017.tar.xz mirror://gentoo/texlive-module-cochineal.doc-2017.tar.xz mirror://gentoo/texlive-module-comfortaa.doc-2017.tar.xz mirror://gentoo/texlive-module-comicneue.doc-2017.tar.xz mirror://gentoo/texlive-module-concmath-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-cormorantgaramond.doc-2017.tar.xz mirror://gentoo/texlive-module-countriesofeurope.doc-2017.tar.xz mirror://gentoo/texlive-module-courier-scaled.doc-2017.tar.xz mirror://gentoo/texlive-module-crimson.doc-2017.tar.xz mirror://gentoo/texlive-module-cryst.doc-2017.tar.xz mirror://gentoo/texlive-module-cyklop.doc-2017.tar.xz mirror://gentoo/texlive-module-dantelogo.doc-2017.tar.xz mirror://gentoo/texlive-module-dejavu.doc-2017.tar.xz mirror://gentoo/texlive-module-dice.doc-2017.tar.xz mirror://gentoo/texlive-module-dictsym.doc-2017.tar.xz mirror://gentoo/texlive-module-dingbat.doc-2017.tar.xz mirror://gentoo/texlive-module-doublestroke.doc-2017.tar.xz mirror://gentoo/texlive-module-dozenal.doc-2017.tar.xz mirror://gentoo/texlive-module-drm.doc-2017.tar.xz mirror://gentoo/texlive-module-droid.doc-2017.tar.xz mirror://gentoo/texlive-module-duerer.doc-2017.tar.xz mirror://gentoo/texlive-module-duerer-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-dutchcal.doc-2017.tar.xz mirror://gentoo/texlive-module-ean.doc-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond.doc-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths.doc-2017.tar.xz mirror://gentoo/texlive-module-ecc.doc-2017.tar.xz mirror://gentoo/texlive-module-eco.doc-2017.tar.xz mirror://gentoo/texlive-module-eiad.doc-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx.doc-2017.tar.xz mirror://gentoo/texlive-module-electrum.doc-2017.tar.xz mirror://gentoo/texlive-module-elvish.doc-2017.tar.xz mirror://gentoo/texlive-module-epigrafica.doc-2017.tar.xz mirror://gentoo/texlive-module-epsdice.doc-2017.tar.xz mirror://gentoo/texlive-module-erewhon.doc-2017.tar.xz mirror://gentoo/texlive-module-esrelation.doc-2017.tar.xz mirror://gentoo/texlive-module-esstix.doc-2017.tar.xz mirror://gentoo/texlive-module-esvect.doc-2017.tar.xz mirror://gentoo/texlive-module-eulervm.doc-2017.tar.xz mirror://gentoo/texlive-module-fbb.doc-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-fetamont.doc-2017.tar.xz mirror://gentoo/texlive-module-feyn.doc-2017.tar.xz mirror://gentoo/texlive-module-fge.doc-2017.tar.xz mirror://gentoo/texlive-module-fira.doc-2017.tar.xz mirror://gentoo/texlive-module-foekfont.doc-2017.tar.xz mirror://gentoo/texlive-module-fonetika.doc-2017.tar.xz mirror://gentoo/texlive-module-fontawesome.doc-2017.tar.xz mirror://gentoo/texlive-module-fontmfizz.doc-2017.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic.doc-2017.tar.xz mirror://gentoo/texlive-module-fourier.doc-2017.tar.xz mirror://gentoo/texlive-module-fouriernc.doc-2017.tar.xz mirror://gentoo/texlive-module-frcursive.doc-2017.tar.xz mirror://gentoo/texlive-module-frederika2016.doc-2017.tar.xz mirror://gentoo/texlive-module-genealogy.doc-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsartemisia.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsbodoni.doc-2017.tar.xz mirror://gentoo/texlive-module-gfscomplutum.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsdidot.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsneohellenic.doc-2017.tar.xz mirror://gentoo/texlive-module-gfssolomos.doc-2017.tar.xz mirror://gentoo/texlive-module-gillcm.doc-2017.tar.xz mirror://gentoo/texlive-module-gillius.doc-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont.doc-2017.tar.xz mirror://gentoo/texlive-module-gofonts.doc-2017.tar.xz mirror://gentoo/texlive-module-gothic.doc-2017.tar.xz mirror://gentoo/texlive-module-greenpoint.doc-2017.tar.xz mirror://gentoo/texlive-module-grotesq.doc-2017.tar.xz mirror://gentoo/texlive-module-hacm.doc-2017.tar.xz mirror://gentoo/texlive-module-heuristica.doc-2017.tar.xz mirror://gentoo/texlive-module-hfbright.doc-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty.doc-2017.tar.xz mirror://gentoo/texlive-module-ifsym.doc-2017.tar.xz mirror://gentoo/texlive-module-imfellenglish.doc-2017.tar.xz mirror://gentoo/texlive-module-inconsolata.doc-2017.tar.xz mirror://gentoo/texlive-module-initials.doc-2017.tar.xz mirror://gentoo/texlive-module-ipaex-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-iwona.doc-2017.tar.xz mirror://gentoo/texlive-module-jablantile.doc-2017.tar.xz mirror://gentoo/texlive-module-jamtimes.doc-2017.tar.xz mirror://gentoo/texlive-module-junicode.doc-2017.tar.xz mirror://gentoo/texlive-module-kixfont.doc-2017.tar.xz mirror://gentoo/texlive-module-kpfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-kurier.doc-2017.tar.xz mirror://gentoo/texlive-module-lato.doc-2017.tar.xz mirror://gentoo/texlive-module-lfb.doc-2017.tar.xz mirror://gentoo/texlive-module-libertine.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinegc.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinus.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinust1math.doc-2017.tar.xz mirror://gentoo/texlive-module-librebaskerville.doc-2017.tar.xz mirror://gentoo/texlive-module-librebodoni.doc-2017.tar.xz mirror://gentoo/texlive-module-librecaslon.doc-2017.tar.xz mirror://gentoo/texlive-module-libris.doc-2017.tar.xz mirror://gentoo/texlive-module-linearA.doc-2017.tar.xz mirror://gentoo/texlive-module-lobster2.doc-2017.tar.xz mirror://gentoo/texlive-module-lxfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-ly1.doc-2017.tar.xz mirror://gentoo/texlive-module-mathabx.doc-2017.tar.xz mirror://gentoo/texlive-module-mathabx-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-mathdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-mdputu.doc-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-merriweather.doc-2017.tar.xz mirror://gentoo/texlive-module-miama.doc-2017.tar.xz mirror://gentoo/texlive-module-mintspirit.doc-2017.tar.xz mirror://gentoo/texlive-module-missaali.doc-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-montserrat.doc-2017.tar.xz mirror://gentoo/texlive-module-mweights.doc-2017.tar.xz mirror://gentoo/texlive-module-newpx.doc-2017.tar.xz mirror://gentoo/texlive-module-newtx.doc-2017.tar.xz mirror://gentoo/texlive-module-newtxsf.doc-2017.tar.xz mirror://gentoo/texlive-module-newtxtt.doc-2017.tar.xz mirror://gentoo/texlive-module-nimbus15.doc-2017.tar.xz mirror://gentoo/texlive-module-nkarta.doc-2017.tar.xz mirror://gentoo/texlive-module-noto.doc-2017.tar.xz mirror://gentoo/texlive-module-obnov.doc-2017.tar.xz mirror://gentoo/texlive-module-ocherokee.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-b.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.doc-2017.tar.xz mirror://gentoo/texlive-module-ogham.doc-2017.tar.xz mirror://gentoo/texlive-module-oinuit.doc-2017.tar.xz mirror://gentoo/texlive-module-old-arrows.doc-2017.tar.xz mirror://gentoo/texlive-module-oldlatin.doc-2017.tar.xz mirror://gentoo/texlive-module-oldstandard.doc-2017.tar.xz mirror://gentoo/texlive-module-opensans.doc-2017.tar.xz mirror://gentoo/texlive-module-orkhun.doc-2017.tar.xz mirror://gentoo/texlive-module-overlock.doc-2017.tar.xz mirror://gentoo/texlive-module-pacioli.doc-2017.tar.xz mirror://gentoo/texlive-module-paratype.doc-2017.tar.xz mirror://gentoo/texlive-module-phaistos.doc-2017.tar.xz mirror://gentoo/texlive-module-phonetic.doc-2017.tar.xz mirror://gentoo/texlive-module-pigpen.doc-2017.tar.xz mirror://gentoo/texlive-module-playfair.doc-2017.tar.xz mirror://gentoo/texlive-module-poltawski.doc-2017.tar.xz mirror://gentoo/texlive-module-prodint.doc-2017.tar.xz mirror://gentoo/texlive-module-punk.doc-2017.tar.xz mirror://gentoo/texlive-module-punk-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-punknova.doc-2017.tar.xz mirror://gentoo/texlive-module-pxtxalfa.doc-2017.tar.xz mirror://gentoo/texlive-module-quattrocento.doc-2017.tar.xz mirror://gentoo/texlive-module-raleway.doc-2017.tar.xz mirror://gentoo/texlive-module-recycle.doc-2017.tar.xz mirror://gentoo/texlive-module-roboto.doc-2017.tar.xz mirror://gentoo/texlive-module-romande.doc-2017.tar.xz mirror://gentoo/texlive-module-rosario.doc-2017.tar.xz mirror://gentoo/texlive-module-rsfso.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmathaccent.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmathfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-schulschriften.doc-2017.tar.xz mirror://gentoo/texlive-module-semaphor.doc-2017.tar.xz mirror://gentoo/texlive-module-sourcecodepro.doc-2017.tar.xz mirror://gentoo/texlive-module-sourcesanspro.doc-2017.tar.xz mirror://gentoo/texlive-module-sourceserifpro.doc-2017.tar.xz mirror://gentoo/texlive-module-starfont.doc-2017.tar.xz mirror://gentoo/texlive-module-staves.doc-2017.tar.xz mirror://gentoo/texlive-module-stix.doc-2017.tar.xz mirror://gentoo/texlive-module-superiors.doc-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-tapir.doc-2017.tar.xz mirror://gentoo/texlive-module-tempora.doc-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript.doc-2017.tar.xz mirror://gentoo/texlive-module-tfrupee.doc-2017.tar.xz mirror://gentoo/texlive-module-tinos.doc-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts.doc-2017.tar.xz mirror://gentoo/texlive-module-trajan.doc-2017.tar.xz mirror://gentoo/texlive-module-txfontsb.doc-2017.tar.xz mirror://gentoo/texlive-module-txuprcal.doc-2017.tar.xz mirror://gentoo/texlive-module-typicons.doc-2017.tar.xz mirror://gentoo/texlive-module-universa.doc-2017.tar.xz mirror://gentoo/texlive-module-universalis.doc-2017.tar.xz mirror://gentoo/texlive-module-uppunctlm.doc-2017.tar.xz mirror://gentoo/texlive-module-urwchancal.doc-2017.tar.xz mirror://gentoo/texlive-module-venturisadf.doc-2017.tar.xz mirror://gentoo/texlive-module-wsuipa.doc-2017.tar.xz mirror://gentoo/texlive-module-xcharter.doc-2017.tar.xz mirror://gentoo/texlive-module-xits.doc-2017.tar.xz mirror://gentoo/texlive-module-yfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-yfonts-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-yinit-otf.doc-2017.tar.xz mirror://gentoo/texlive-module-zlmtt.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-allrunes.source-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro.source-2017.tar.xz mirror://gentoo/texlive-module-archaic.source-2017.tar.xz mirror://gentoo/texlive-module-arev.source-2017.tar.xz mirror://gentoo/texlive-module-asapsym.source-2017.tar.xz mirror://gentoo/texlive-module-ascii-font.source-2017.tar.xz mirror://gentoo/texlive-module-auncial-new.source-2017.tar.xz mirror://gentoo/texlive-module-b1encoding.source-2017.tar.xz mirror://gentoo/texlive-module-barcodes.source-2017.tar.xz mirror://gentoo/texlive-module-baskervald.source-2017.tar.xz mirror://gentoo/texlive-module-bbding.source-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros.source-2017.tar.xz mirror://gentoo/texlive-module-bbold.source-2017.tar.xz mirror://gentoo/texlive-module-belleek.source-2017.tar.xz mirror://gentoo/texlive-module-bguq.source-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1.source-2017.tar.xz mirror://gentoo/texlive-module-bookhands.source-2017.tar.xz mirror://gentoo/texlive-module-cantarell.source-2017.tar.xz mirror://gentoo/texlive-module-ccicons.source-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm.source-2017.tar.xz mirror://gentoo/texlive-module-chivo.source-2017.tar.xz mirror://gentoo/texlive-module-cmbright.source-2017.tar.xz mirror://gentoo/texlive-module-cmll.source-2017.tar.xz mirror://gentoo/texlive-module-comfortaa.source-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-dingbat.source-2017.tar.xz mirror://gentoo/texlive-module-dozenal.source-2017.tar.xz mirror://gentoo/texlive-module-drm.source-2017.tar.xz mirror://gentoo/texlive-module-droid.source-2017.tar.xz mirror://gentoo/texlive-module-eco.source-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx.source-2017.tar.xz mirror://gentoo/texlive-module-electrum.source-2017.tar.xz mirror://gentoo/texlive-module-epsdice.source-2017.tar.xz mirror://gentoo/texlive-module-esrelation.source-2017.tar.xz mirror://gentoo/texlive-module-esvect.source-2017.tar.xz mirror://gentoo/texlive-module-eulervm.source-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-fetamont.source-2017.tar.xz mirror://gentoo/texlive-module-feyn.source-2017.tar.xz mirror://gentoo/texlive-module-fge.source-2017.tar.xz mirror://gentoo/texlive-module-fourier.source-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug.source-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont.source-2017.tar.xz mirror://gentoo/texlive-module-gothic.source-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty.source-2017.tar.xz mirror://gentoo/texlive-module-lato.source-2017.tar.xz mirror://gentoo/texlive-module-libris.source-2017.tar.xz mirror://gentoo/texlive-module-linearA.source-2017.tar.xz mirror://gentoo/texlive-module-lxfonts.source-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-miama.source-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-nkarta.source-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.source-2017.tar.xz mirror://gentoo/texlive-module-oinuit.source-2017.tar.xz mirror://gentoo/texlive-module-opensans.source-2017.tar.xz mirror://gentoo/texlive-module-pacioli.source-2017.tar.xz mirror://gentoo/texlive-module-phaistos.source-2017.tar.xz mirror://gentoo/texlive-module-romande.source-2017.tar.xz mirror://gentoo/texlive-module-rosario.source-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts.source-2017.tar.xz mirror://gentoo/texlive-module-skull.source-2017.tar.xz mirror://gentoo/texlive-module-staves.source-2017.tar.xz mirror://gentoo/texlive-module-stix.source-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript.source-2017.tar.xz mirror://gentoo/texlive-module-tfrupee.source-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts.source-2017.tar.xz mirror://gentoo/texlive-module-trajan.source-2017.tar.xz mirror://gentoo/texlive-module-txfontsb.source-2017.tar.xz mirror://gentoo/texlive-module-universa.source-2017.tar.xz mirror://gentoo/texlive-module-venturisadf.source-2017.tar.xz mirror://gentoo/texlive-module-xits.source-2017.tar.xz mirror://gentoo/texlive-module-yfonts.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20da774bac72730eea5727269db20217
+_md5_=2b35ca7dab07f68836f49d722041e716
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017 b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
index 357e918caf14..e9b5585b5194 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
@@ -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 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=BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=dev-texlive/texlive-basic-2007* !<dev-texlive/texlive-fontsextra-2010 !<dev-texlive/texlive-latexrecommended-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-avantgar-2017.tar.xz mirror://gentoo/texlive-module-bookman-2017.tar.xz mirror://gentoo/texlive-module-charter-2017.tar.xz mirror://gentoo/texlive-module-cm-super-2017.tar.xz mirror://gentoo/texlive-module-cmextra-2017.tar.xz mirror://gentoo/texlive-module-courier-2017.tar.xz mirror://gentoo/texlive-module-ec-2017.tar.xz mirror://gentoo/texlive-module-euro-2017.tar.xz mirror://gentoo/texlive-module-euro-ce-2017.tar.xz mirror://gentoo/texlive-module-eurosym-2017.tar.xz mirror://gentoo/texlive-module-fpl-2017.tar.xz mirror://gentoo/texlive-module-helvetic-2017.tar.xz mirror://gentoo/texlive-module-lm-2017.tar.xz mirror://gentoo/texlive-module-lm-math-2017.tar.xz mirror://gentoo/texlive-module-marvosym-2017.tar.xz mirror://gentoo/texlive-module-mathpazo-2017.tar.xz mirror://gentoo/texlive-module-manfnt-font-2017.tar.xz mirror://gentoo/texlive-module-mflogo-font-2017.tar.xz mirror://gentoo/texlive-module-ncntrsbk-2017.tar.xz mirror://gentoo/texlive-module-palatino-2017.tar.xz mirror://gentoo/texlive-module-pxfonts-2017.tar.xz mirror://gentoo/texlive-module-rsfs-2017.tar.xz mirror://gentoo/texlive-module-symbol-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math-2017.tar.xz mirror://gentoo/texlive-module-times-2017.tar.xz mirror://gentoo/texlive-module-tipa-2017.tar.xz mirror://gentoo/texlive-module-txfonts-2017.tar.xz mirror://gentoo/texlive-module-utopia-2017.tar.xz mirror://gentoo/texlive-module-wasy-2017.tar.xz mirror://gentoo/texlive-module-wasy2-ps-2017.tar.xz mirror://gentoo/texlive-module-wasysym-2017.tar.xz mirror://gentoo/texlive-module-zapfchan-2017.tar.xz mirror://gentoo/texlive-module-zapfding-2017.tar.xz mirror://gentoo/texlive-module-collection-fontsrecommended-2017.tar.xz doc? ( mirror://gentoo/texlive-module-charter.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-super.doc-2017.tar.xz mirror://gentoo/texlive-module-ec.doc-2017.tar.xz mirror://gentoo/texlive-module-euro.doc-2017.tar.xz mirror://gentoo/texlive-module-euro-ce.doc-2017.tar.xz mirror://gentoo/texlive-module-eurosym.doc-2017.tar.xz mirror://gentoo/texlive-module-fpl.doc-2017.tar.xz mirror://gentoo/texlive-module-lm.doc-2017.tar.xz mirror://gentoo/texlive-module-lm-math.doc-2017.tar.xz mirror://gentoo/texlive-module-marvosym.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpazo.doc-2017.tar.xz mirror://gentoo/texlive-module-mflogo-font.doc-2017.tar.xz mirror://gentoo/texlive-module-pxfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-rsfs.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.doc-2017.tar.xz mirror://gentoo/texlive-module-tipa.doc-2017.tar.xz mirror://gentoo/texlive-module-txfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-utopia.doc-2017.tar.xz mirror://gentoo/texlive-module-wasy.doc-2017.tar.xz mirror://gentoo/texlive-module-wasy2-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-wasysym.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-euro.source-2017.tar.xz mirror://gentoo/texlive-module-fpl.source-2017.tar.xz mirror://gentoo/texlive-module-lm.source-2017.tar.xz mirror://gentoo/texlive-module-marvosym.source-2017.tar.xz mirror://gentoo/texlive-module-mathpazo.source-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.source-2017.tar.xz mirror://gentoo/texlive-module-wasysym.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a8ef143ca58b23d89e98d2902f4a316
+_md5_=abbddaeae64bb75235123ca17e57c9a3
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontutils-2017 b/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
index d2a0ac60e4d5..c3c34026013c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
@@ -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 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=Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-psutils !<dev-texlive/texlive-fontsextra-2009 !<app-text/texlive-core-2013 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-accfonts-2017.tar.xz mirror://gentoo/texlive-module-afm2pl-2017.tar.xz mirror://gentoo/texlive-module-dosepsbin-2017.tar.xz mirror://gentoo/texlive-module-epstopdf-2017.tar.xz mirror://gentoo/texlive-module-fontware-2017.tar.xz mirror://gentoo/texlive-module-lcdftypetools-2017.tar.xz mirror://gentoo/texlive-module-metatype1-2017.tar.xz mirror://gentoo/texlive-module-ps2pk-2017.tar.xz mirror://gentoo/texlive-module-pstools-2017.tar.xz mirror://gentoo/texlive-module-psutils-2017.tar.xz mirror://gentoo/texlive-module-dvipsconfig-2017.tar.xz mirror://gentoo/texlive-module-fontinst-2017.tar.xz mirror://gentoo/texlive-module-fontools-2017.tar.xz mirror://gentoo/texlive-module-mf2pt1-2017.tar.xz mirror://gentoo/texlive-module-t1utils-2017.tar.xz mirror://gentoo/texlive-module-collection-fontutils-2017.tar.xz doc? ( mirror://gentoo/texlive-module-accfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-afm2pl.doc-2017.tar.xz mirror://gentoo/texlive-module-dosepsbin.doc-2017.tar.xz mirror://gentoo/texlive-module-epstopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-fontware.doc-2017.tar.xz mirror://gentoo/texlive-module-lcdftypetools.doc-2017.tar.xz mirror://gentoo/texlive-module-ps2pk.doc-2017.tar.xz mirror://gentoo/texlive-module-pstools.doc-2017.tar.xz mirror://gentoo/texlive-module-psutils.doc-2017.tar.xz mirror://gentoo/texlive-module-fontinst.doc-2017.tar.xz mirror://gentoo/texlive-module-fontools.doc-2017.tar.xz mirror://gentoo/texlive-module-mf2pt1.doc-2017.tar.xz mirror://gentoo/texlive-module-t1utils.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-dosepsbin.source-2017.tar.xz mirror://gentoo/texlive-module-metatype1.source-2017.tar.xz mirror://gentoo/texlive-module-fontinst.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f8772c020ad19380542b39748c145eb4
+_md5_=b48c6c7c1a77e5c169d7d9973cc80b70
diff --git a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017 b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
index 35c1b61e0935..3de6eaf03dd6 100644
--- a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Additional formats
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 >=dev-texlive/texlive-latex-2008 dev-texlive/texlive-xetex !<dev-texlive/texlive-fontsextra-2009 !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2014 !dev-texlive/texlive-omega >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-edmac-2017.tar.xz mirror://gentoo/texlive-module-eplain-2017.tar.xz mirror://gentoo/texlive-module-lollipop-2017.tar.xz mirror://gentoo/texlive-module-mltex-2017.tar.xz mirror://gentoo/texlive-module-psizzl-2017.tar.xz mirror://gentoo/texlive-module-startex-2017.tar.xz mirror://gentoo/texlive-module-texsis-2017.tar.xz mirror://gentoo/texlive-module-xmltexconfig-2017.tar.xz mirror://gentoo/texlive-module-aleph-2017.tar.xz mirror://gentoo/texlive-module-antomega-2017.tar.xz mirror://gentoo/texlive-module-lambda-2017.tar.xz mirror://gentoo/texlive-module-mxedruli-2017.tar.xz mirror://gentoo/texlive-module-omega-2017.tar.xz mirror://gentoo/texlive-module-omegaware-2017.tar.xz mirror://gentoo/texlive-module-otibet-2017.tar.xz mirror://gentoo/texlive-module-collection-formatsextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-edmac.doc-2017.tar.xz mirror://gentoo/texlive-module-eplain.doc-2017.tar.xz mirror://gentoo/texlive-module-lollipop.doc-2017.tar.xz mirror://gentoo/texlive-module-mltex.doc-2017.tar.xz mirror://gentoo/texlive-module-psizzl.doc-2017.tar.xz mirror://gentoo/texlive-module-startex.doc-2017.tar.xz mirror://gentoo/texlive-module-texsis.doc-2017.tar.xz mirror://gentoo/texlive-module-aleph.doc-2017.tar.xz mirror://gentoo/texlive-module-antomega.doc-2017.tar.xz mirror://gentoo/texlive-module-mxedruli.doc-2017.tar.xz mirror://gentoo/texlive-module-omega.doc-2017.tar.xz mirror://gentoo/texlive-module-omegaware.doc-2017.tar.xz mirror://gentoo/texlive-module-otibet.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-edmac.source-2017.tar.xz mirror://gentoo/texlive-module-eplain.source-2017.tar.xz mirror://gentoo/texlive-module-psizzl.source-2017.tar.xz mirror://gentoo/texlive-module-startex.source-2017.tar.xz mirror://gentoo/texlive-module-antomega.source-2017.tar.xz mirror://gentoo/texlive-module-otibet.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db900ff0d7a9d6fb466f92f1fd45b0fa
+_md5_=9fcd5be798334664c4d414ae6dd71ace
diff --git a/metadata/md5-cache/dev-texlive/texlive-games-2017 b/metadata/md5-cache/dev-texlive/texlive-games-2017
index 5ce3353aedc0..13380ce88917 100644
--- a/metadata/md5-cache/dev-texlive/texlive-games-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-games-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Games typesetting
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2009 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-bartel-chess-fonts-2017.tar.xz mirror://gentoo/texlive-module-chess-2017.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams-2017.tar.xz mirror://gentoo/texlive-module-chessboard-2017.tar.xz mirror://gentoo/texlive-module-chessfss-2017.tar.xz mirror://gentoo/texlive-module-crossword-2017.tar.xz mirror://gentoo/texlive-module-crosswrd-2017.tar.xz mirror://gentoo/texlive-module-egameps-2017.tar.xz mirror://gentoo/texlive-module-gamebook-2017.tar.xz mirror://gentoo/texlive-module-go-2017.tar.xz mirror://gentoo/texlive-module-hanoi-2017.tar.xz mirror://gentoo/texlive-module-havannah-2017.tar.xz mirror://gentoo/texlive-module-hexgame-2017.tar.xz mirror://gentoo/texlive-module-horoscop-2017.tar.xz mirror://gentoo/texlive-module-labyrinth-2017.tar.xz mirror://gentoo/texlive-module-logicpuzzle-2017.tar.xz mirror://gentoo/texlive-module-othello-2017.tar.xz mirror://gentoo/texlive-module-othelloboard-2017.tar.xz mirror://gentoo/texlive-module-pas-crosswords-2017.tar.xz mirror://gentoo/texlive-module-psgo-2017.tar.xz mirror://gentoo/texlive-module-reverxii-2017.tar.xz mirror://gentoo/texlive-module-rubik-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess-2017.tar.xz mirror://gentoo/texlive-module-sgame-2017.tar.xz mirror://gentoo/texlive-module-skak-2017.tar.xz mirror://gentoo/texlive-module-skaknew-2017.tar.xz mirror://gentoo/texlive-module-soup-2017.tar.xz mirror://gentoo/texlive-module-sudoku-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle-2017.tar.xz mirror://gentoo/texlive-module-xq-2017.tar.xz mirror://gentoo/texlive-module-xskak-2017.tar.xz mirror://gentoo/texlive-module-collection-games-2017.tar.xz doc? ( mirror://gentoo/texlive-module-bartel-chess-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-chess.doc-2017.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams.doc-2017.tar.xz mirror://gentoo/texlive-module-chessboard.doc-2017.tar.xz mirror://gentoo/texlive-module-chessfss.doc-2017.tar.xz mirror://gentoo/texlive-module-crossword.doc-2017.tar.xz mirror://gentoo/texlive-module-crosswrd.doc-2017.tar.xz mirror://gentoo/texlive-module-egameps.doc-2017.tar.xz mirror://gentoo/texlive-module-gamebook.doc-2017.tar.xz mirror://gentoo/texlive-module-go.doc-2017.tar.xz mirror://gentoo/texlive-module-havannah.doc-2017.tar.xz mirror://gentoo/texlive-module-hexgame.doc-2017.tar.xz mirror://gentoo/texlive-module-horoscop.doc-2017.tar.xz mirror://gentoo/texlive-module-labyrinth.doc-2017.tar.xz mirror://gentoo/texlive-module-logicpuzzle.doc-2017.tar.xz mirror://gentoo/texlive-module-othello.doc-2017.tar.xz mirror://gentoo/texlive-module-othelloboard.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-crosswords.doc-2017.tar.xz mirror://gentoo/texlive-module-psgo.doc-2017.tar.xz mirror://gentoo/texlive-module-reverxii.doc-2017.tar.xz mirror://gentoo/texlive-module-rubik.doc-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.doc-2017.tar.xz mirror://gentoo/texlive-module-sgame.doc-2017.tar.xz mirror://gentoo/texlive-module-skak.doc-2017.tar.xz mirror://gentoo/texlive-module-skaknew.doc-2017.tar.xz mirror://gentoo/texlive-module-soup.doc-2017.tar.xz mirror://gentoo/texlive-module-sudoku.doc-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle.doc-2017.tar.xz mirror://gentoo/texlive-module-xq.doc-2017.tar.xz mirror://gentoo/texlive-module-xskak.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-chess-problem-diagrams.source-2017.tar.xz mirror://gentoo/texlive-module-chessboard.source-2017.tar.xz mirror://gentoo/texlive-module-chessfss.source-2017.tar.xz mirror://gentoo/texlive-module-crossword.source-2017.tar.xz mirror://gentoo/texlive-module-crosswrd.source-2017.tar.xz mirror://gentoo/texlive-module-gamebook.source-2017.tar.xz mirror://gentoo/texlive-module-go.source-2017.tar.xz mirror://gentoo/texlive-module-havannah.source-2017.tar.xz mirror://gentoo/texlive-module-horoscop.source-2017.tar.xz mirror://gentoo/texlive-module-rubik.source-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.source-2017.tar.xz mirror://gentoo/texlive-module-soup.source-2017.tar.xz mirror://gentoo/texlive-module-sudoku.source-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle.source-2017.tar.xz mirror://gentoo/texlive-module-xskak.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc79bfb61655c1718b293127b3285a81
+_md5_=9935dfd38d9a770558155cec86f42439
diff --git a/metadata/md5-cache/dev-texlive/texlive-humanities-2017 b/metadata/md5-cache/dev-texlive/texlive-humanities-2017
index e23be7114eb8..eaab1f0cbc9e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-humanities-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-humanities-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Humanities packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-latex-2017 !dev-tex/lineno >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adtrees-2017.tar.xz mirror://gentoo/texlive-module-bibleref-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth-2017.tar.xz mirror://gentoo/texlive-module-bibleref-parse-2017.tar.xz mirror://gentoo/texlive-module-covington-2017.tar.xz mirror://gentoo/texlive-module-diadia-2017.tar.xz mirror://gentoo/texlive-module-dramatist-2017.tar.xz mirror://gentoo/texlive-module-dvgloss-2017.tar.xz mirror://gentoo/texlive-module-ecltree-2017.tar.xz mirror://gentoo/texlive-module-edfnotes-2017.tar.xz mirror://gentoo/texlive-module-ednotes-2017.tar.xz mirror://gentoo/texlive-module-eledform-2017.tar.xz mirror://gentoo/texlive-module-eledmac-2017.tar.xz mirror://gentoo/texlive-module-expex-2017.tar.xz mirror://gentoo/texlive-module-gb4e-2017.tar.xz mirror://gentoo/texlive-module-gmverse-2017.tar.xz mirror://gentoo/texlive-module-jura-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev-2017.tar.xz mirror://gentoo/texlive-module-juramisc-2017.tar.xz mirror://gentoo/texlive-module-jurarsp-2017.tar.xz mirror://gentoo/texlive-module-ledmac-2017.tar.xz mirror://gentoo/texlive-module-leipzig-2017.tar.xz mirror://gentoo/texlive-module-lexikon-2017.tar.xz mirror://gentoo/texlive-module-lexref-2017.tar.xz mirror://gentoo/texlive-module-ling-macros-2017.tar.xz mirror://gentoo/texlive-module-linguex-2017.tar.xz mirror://gentoo/texlive-module-liturg-2017.tar.xz mirror://gentoo/texlive-module-metrix-2017.tar.xz mirror://gentoo/texlive-module-parallel-2017.tar.xz mirror://gentoo/texlive-module-parrun-2017.tar.xz mirror://gentoo/texlive-module-phonrule-2017.tar.xz mirror://gentoo/texlive-module-plari-2017.tar.xz mirror://gentoo/texlive-module-play-2017.tar.xz mirror://gentoo/texlive-module-poemscol-2017.tar.xz mirror://gentoo/texlive-module-poetrytex-2017.tar.xz mirror://gentoo/texlive-module-qobitree-2017.tar.xz mirror://gentoo/texlive-module-qtree-2017.tar.xz mirror://gentoo/texlive-module-reledmac-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees-2017.tar.xz mirror://gentoo/texlive-module-rtklage-2017.tar.xz mirror://gentoo/texlive-module-screenplay-2017.tar.xz mirror://gentoo/texlive-module-screenplay-pkg-2017.tar.xz mirror://gentoo/texlive-module-sides-2017.tar.xz mirror://gentoo/texlive-module-stage-2017.tar.xz mirror://gentoo/texlive-module-textglos-2017.tar.xz mirror://gentoo/texlive-module-thalie-2017.tar.xz mirror://gentoo/texlive-module-tree-dvips-2017.tar.xz mirror://gentoo/texlive-module-verse-2017.tar.xz mirror://gentoo/texlive-module-xyling-2017.tar.xz mirror://gentoo/texlive-module-collection-humanities-2017.tar.xz doc? ( mirror://gentoo/texlive-module-adtrees.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-parse.doc-2017.tar.xz mirror://gentoo/texlive-module-covington.doc-2017.tar.xz mirror://gentoo/texlive-module-diadia.doc-2017.tar.xz mirror://gentoo/texlive-module-dramatist.doc-2017.tar.xz mirror://gentoo/texlive-module-dvgloss.doc-2017.tar.xz mirror://gentoo/texlive-module-ecltree.doc-2017.tar.xz mirror://gentoo/texlive-module-edfnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-ednotes.doc-2017.tar.xz mirror://gentoo/texlive-module-eledform.doc-2017.tar.xz mirror://gentoo/texlive-module-eledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-expex.doc-2017.tar.xz mirror://gentoo/texlive-module-gb4e.doc-2017.tar.xz mirror://gentoo/texlive-module-gmverse.doc-2017.tar.xz mirror://gentoo/texlive-module-jura.doc-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev.doc-2017.tar.xz mirror://gentoo/texlive-module-juramisc.doc-2017.tar.xz mirror://gentoo/texlive-module-jurarsp.doc-2017.tar.xz mirror://gentoo/texlive-module-ledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-leipzig.doc-2017.tar.xz mirror://gentoo/texlive-module-lexikon.doc-2017.tar.xz mirror://gentoo/texlive-module-lexref.doc-2017.tar.xz mirror://gentoo/texlive-module-ling-macros.doc-2017.tar.xz mirror://gentoo/texlive-module-linguex.doc-2017.tar.xz mirror://gentoo/texlive-module-liturg.doc-2017.tar.xz mirror://gentoo/texlive-module-metrix.doc-2017.tar.xz mirror://gentoo/texlive-module-parallel.doc-2017.tar.xz mirror://gentoo/texlive-module-parrun.doc-2017.tar.xz mirror://gentoo/texlive-module-phonrule.doc-2017.tar.xz mirror://gentoo/texlive-module-plari.doc-2017.tar.xz mirror://gentoo/texlive-module-play.doc-2017.tar.xz mirror://gentoo/texlive-module-poemscol.doc-2017.tar.xz mirror://gentoo/texlive-module-poetrytex.doc-2017.tar.xz mirror://gentoo/texlive-module-qobitree.doc-2017.tar.xz mirror://gentoo/texlive-module-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-reledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees.doc-2017.tar.xz mirror://gentoo/texlive-module-rtklage.doc-2017.tar.xz mirror://gentoo/texlive-module-screenplay.doc-2017.tar.xz mirror://gentoo/texlive-module-screenplay-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-sides.doc-2017.tar.xz mirror://gentoo/texlive-module-stage.doc-2017.tar.xz mirror://gentoo/texlive-module-textglos.doc-2017.tar.xz mirror://gentoo/texlive-module-thalie.doc-2017.tar.xz mirror://gentoo/texlive-module-tree-dvips.doc-2017.tar.xz mirror://gentoo/texlive-module-verse.doc-2017.tar.xz mirror://gentoo/texlive-module-xyling.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-bibleref.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.source-2017.tar.xz mirror://gentoo/texlive-module-dramatist.source-2017.tar.xz mirror://gentoo/texlive-module-dvgloss.source-2017.tar.xz mirror://gentoo/texlive-module-edfnotes.source-2017.tar.xz mirror://gentoo/texlive-module-eledform.source-2017.tar.xz mirror://gentoo/texlive-module-eledmac.source-2017.tar.xz mirror://gentoo/texlive-module-jura.source-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev.source-2017.tar.xz mirror://gentoo/texlive-module-jurarsp.source-2017.tar.xz mirror://gentoo/texlive-module-ledmac.source-2017.tar.xz mirror://gentoo/texlive-module-leipzig.source-2017.tar.xz mirror://gentoo/texlive-module-liturg.source-2017.tar.xz mirror://gentoo/texlive-module-metrix.source-2017.tar.xz mirror://gentoo/texlive-module-parallel.source-2017.tar.xz mirror://gentoo/texlive-module-parrun.source-2017.tar.xz mirror://gentoo/texlive-module-plari.source-2017.tar.xz mirror://gentoo/texlive-module-play.source-2017.tar.xz mirror://gentoo/texlive-module-poemscol.source-2017.tar.xz mirror://gentoo/texlive-module-poetrytex.source-2017.tar.xz mirror://gentoo/texlive-module-reledmac.source-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees.source-2017.tar.xz mirror://gentoo/texlive-module-screenplay.source-2017.tar.xz mirror://gentoo/texlive-module-textglos.source-2017.tar.xz mirror://gentoo/texlive-module-thalie.source-2017.tar.xz mirror://gentoo/texlive-module-verse.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7aa3b1b83edf10ff2b33c4c51c383745
+_md5_=c2ac46ba9b25a50705d6881250d4cb35
diff --git a/metadata/md5-cache/dev-texlive/texlive-langarabic-2017 b/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
index 7e80bedb5575..79820b56195d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Arabic
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !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-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amiri-2017.tar.xz mirror://gentoo/texlive-module-arabi-2017.tar.xz mirror://gentoo/texlive-module-arabi-add-2017.tar.xz mirror://gentoo/texlive-module-arabluatex-2017.tar.xz mirror://gentoo/texlive-module-arabtex-2017.tar.xz mirror://gentoo/texlive-module-bidi-2017.tar.xz mirror://gentoo/texlive-module-bidihl-2017.tar.xz mirror://gentoo/texlive-module-dad-2017.tar.xz mirror://gentoo/texlive-module-ghab-2017.tar.xz mirror://gentoo/texlive-module-hyphen-arabic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-farsi-2017.tar.xz mirror://gentoo/texlive-module-imsproc-2017.tar.xz mirror://gentoo/texlive-module-lshort-persian-2017.tar.xz mirror://gentoo/texlive-module-persian-bib-2017.tar.xz mirror://gentoo/texlive-module-simurgh-2017.tar.xz mirror://gentoo/texlive-module-tram-2017.tar.xz mirror://gentoo/texlive-module-xepersian-2017.tar.xz mirror://gentoo/texlive-module-collection-langarabic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amiri.doc-2017.tar.xz mirror://gentoo/texlive-module-arabi.doc-2017.tar.xz mirror://gentoo/texlive-module-arabi-add.doc-2017.tar.xz mirror://gentoo/texlive-module-arabluatex.doc-2017.tar.xz mirror://gentoo/texlive-module-arabtex.doc-2017.tar.xz mirror://gentoo/texlive-module-bidi.doc-2017.tar.xz mirror://gentoo/texlive-module-bidihl.doc-2017.tar.xz mirror://gentoo/texlive-module-dad.doc-2017.tar.xz mirror://gentoo/texlive-module-ghab.doc-2017.tar.xz mirror://gentoo/texlive-module-imsproc.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-persian.doc-2017.tar.xz mirror://gentoo/texlive-module-persian-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-simurgh.doc-2017.tar.xz mirror://gentoo/texlive-module-tram.doc-2017.tar.xz mirror://gentoo/texlive-module-xepersian.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-arabluatex.source-2017.tar.xz mirror://gentoo/texlive-module-bidi.source-2017.tar.xz mirror://gentoo/texlive-module-xepersian.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9640b3e6ed87992535317c5860579f83
+_md5_=00d47e7fe56eeae9511fc8d2c903ad2b
diff --git a/metadata/md5-cache/dev-texlive/texlive-langchinese-2017 b/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
index 9025fa5e001f..ee3edeba38c0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Chinese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arphic-2017.tar.xz mirror://gentoo/texlive-module-arphic-ttf-2017.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-cns-2017.tar.xz mirror://gentoo/texlive-module-ctex-2017.tar.xz mirror://gentoo/texlive-module-ctex-faq-2017.tar.xz mirror://gentoo/texlive-module-fandol-2017.tar.xz mirror://gentoo/texlive-module-hyphen-chinese-2017.tar.xz mirror://gentoo/texlive-module-impatient-cn-2017.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-lshort-chinese-2017.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-texproposal-2017.tar.xz mirror://gentoo/texlive-module-xpinyin-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex-2017.tar.xz mirror://gentoo/texlive-module-zhnumber-2017.tar.xz mirror://gentoo/texlive-module-zhspacing-2017.tar.xz mirror://gentoo/texlive-module-collection-langchinese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-arphic.doc-2017.tar.xz mirror://gentoo/texlive-module-arphic-ttf.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-cns.doc-2017.tar.xz mirror://gentoo/texlive-module-ctex.doc-2017.tar.xz mirror://gentoo/texlive-module-ctex-faq.doc-2017.tar.xz mirror://gentoo/texlive-module-fandol.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-chinese.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-texproposal.doc-2017.tar.xz mirror://gentoo/texlive-module-xpinyin.doc-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics.doc-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex.doc-2017.tar.xz mirror://gentoo/texlive-module-zhnumber.doc-2017.tar.xz mirror://gentoo/texlive-module-zhspacing.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ctex.source-2017.tar.xz mirror://gentoo/texlive-module-xpinyin.source-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics.source-2017.tar.xz mirror://gentoo/texlive-module-zhnumber.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9395f5481229df0cd75b03da7bbb9fcb
+_md5_=f95e2554e6821a36e88e1020c50e8819
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcjk-2017 b/metadata/md5-cache/dev-texlive/texlive-langcjk-2017
index edefa8784d56..018a67d116a4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcjk-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langcjk-2017
@@ -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 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=BSD GPL-2 GPL-3 LPPL-1.3 MIT TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=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-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adobemapping-2017.tar.xz mirror://gentoo/texlive-module-c90-2017.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate-2017.tar.xz mirror://gentoo/texlive-module-cjkpunct-2017.tar.xz mirror://gentoo/texlive-module-dnp-2017.tar.xz mirror://gentoo/texlive-module-garuda-c90-2017.tar.xz mirror://gentoo/texlive-module-norasi-c90-2017.tar.xz mirror://gentoo/texlive-module-pxtatescale-2017.tar.xz mirror://gentoo/texlive-module-xcjk2uni-2017.tar.xz mirror://gentoo/texlive-module-zxjafont-2017.tar.xz mirror://gentoo/texlive-module-collection-langcjk-2017.tar.xz doc? ( mirror://gentoo/texlive-module-c90.doc-2017.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate.doc-2017.tar.xz mirror://gentoo/texlive-module-cjkpunct.doc-2017.tar.xz mirror://gentoo/texlive-module-pxtatescale.doc-2017.tar.xz mirror://gentoo/texlive-module-xcjk2uni.doc-2017.tar.xz mirror://gentoo/texlive-module-zxjafont.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-c90.source-2017.tar.xz mirror://gentoo/texlive-module-cjkpunct.source-2017.tar.xz mirror://gentoo/texlive-module-garuda-c90.source-2017.tar.xz mirror://gentoo/texlive-module-norasi-c90.source-2017.tar.xz mirror://gentoo/texlive-module-xcjk2uni.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5f6aeb4900333bbf16a09a7a63c67d5
+_md5_=58f8fc16c7e91d348ff755dc5c446968
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017 b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
index 6f419a872c0b..ea374d572a13 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Cyrillic
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 !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-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-belarusian-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-babel-russian-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-cmcyr-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-bin-2017.tar.xz mirror://gentoo/texlive-module-cyrplain-2017.tar.xz mirror://gentoo/texlive-module-disser-2017.tar.xz mirror://gentoo/texlive-module-eskd-2017.tar.xz mirror://gentoo/texlive-module-eskdx-2017.tar.xz mirror://gentoo/texlive-module-gost-2017.tar.xz mirror://gentoo/texlive-module-hyphen-belarusian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-mongolian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-russian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-serbian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-lcyw-2017.tar.xz mirror://gentoo/texlive-module-lh-2017.tar.xz mirror://gentoo/texlive-module-lhcyr-2017.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-lshort-mongol-2017.tar.xz mirror://gentoo/texlive-module-lshort-russian-2017.tar.xz mirror://gentoo/texlive-module-lshort-ukr-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel-2017.tar.xz mirror://gentoo/texlive-module-montex-2017.tar.xz mirror://gentoo/texlive-module-mpman-ru-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg-2017.tar.xz mirror://gentoo/texlive-module-ruhyphen-2017.tar.xz mirror://gentoo/texlive-module-russ-2017.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe-2017.tar.xz mirror://gentoo/texlive-module-serbian-date-lat-2017.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr-2017.tar.xz mirror://gentoo/texlive-module-serbian-lig-2017.tar.xz mirror://gentoo/texlive-module-t2-2017.tar.xz mirror://gentoo/texlive-module-texlive-ru-2017.tar.xz mirror://gentoo/texlive-module-texlive-sr-2017.tar.xz mirror://gentoo/texlive-module-ukrhyph-2017.tar.xz mirror://gentoo/texlive-module-collection-langcyrillic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-belarusian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.doc-2017.tar.xz mirror://gentoo/texlive-module-churchslavonic.doc-2017.tar.xz mirror://gentoo/texlive-module-cmcyr.doc-2017.tar.xz mirror://gentoo/texlive-module-cyrillic.doc-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-bin.doc-2017.tar.xz mirror://gentoo/texlive-module-disser.doc-2017.tar.xz mirror://gentoo/texlive-module-eskd.doc-2017.tar.xz mirror://gentoo/texlive-module-eskdx.doc-2017.tar.xz mirror://gentoo/texlive-module-gost.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lcyw.doc-2017.tar.xz mirror://gentoo/texlive-module-lh.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-mongol.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-ukr.doc-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-montex.doc-2017.tar.xz mirror://gentoo/texlive-module-mpman-ru.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg.doc-2017.tar.xz mirror://gentoo/texlive-module-russ.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-date-lat.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-lig.doc-2017.tar.xz mirror://gentoo/texlive-module-t2.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-ru.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-sr.doc-2017.tar.xz mirror://gentoo/texlive-module-ukrhyph.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-belarusian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-russian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc.source-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.source-2017.tar.xz mirror://gentoo/texlive-module-cyrillic.source-2017.tar.xz mirror://gentoo/texlive-module-disser.source-2017.tar.xz mirror://gentoo/texlive-module-eskd.source-2017.tar.xz mirror://gentoo/texlive-module-gost.source-2017.tar.xz mirror://gentoo/texlive-module-lcyw.source-2017.tar.xz mirror://gentoo/texlive-module-lh.source-2017.tar.xz mirror://gentoo/texlive-module-lhcyr.source-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel.source-2017.tar.xz mirror://gentoo/texlive-module-ruhyphen.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b42421a3b85cdad690a7a043f2efa16
+_md5_=8e70c99abf164225b7529273226ee7a6
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
index 84eecb5ecf43..d8f6a00a843f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
@@ -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 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-1 GPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 !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-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-czech-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak-2017.tar.xz mirror://gentoo/texlive-module-cnbwp-2017.tar.xz mirror://gentoo/texlive-module-cs-2017.tar.xz mirror://gentoo/texlive-module-csbulletin-2017.tar.xz mirror://gentoo/texlive-module-cslatex-2017.tar.xz mirror://gentoo/texlive-module-csplain-2017.tar.xz mirror://gentoo/texlive-module-cstex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-czech-2017.tar.xz mirror://gentoo/texlive-module-hyphen-slovak-2017.tar.xz mirror://gentoo/texlive-module-lshort-czech-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovak-2017.tar.xz mirror://gentoo/texlive-module-texlive-cz-2017.tar.xz mirror://gentoo/texlive-module-collection-langczechslovak-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-cnbwp.doc-2017.tar.xz mirror://gentoo/texlive-module-csbulletin.doc-2017.tar.xz mirror://gentoo/texlive-module-cstex.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-cz.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-czech.source-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak.source-2017.tar.xz mirror://gentoo/texlive-module-cslatex.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7bbd1ca83bc4d357c6941c1b0f8b8a7
+_md5_=83fd9ddba184048fde80a1685c37837a
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2017 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
index d3478236d734..c9ae9d3777b1 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
@@ -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 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=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-english !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-hyphen-english-2017.tar.xz mirror://gentoo/texlive-module-FAQ-en-2017.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles-2017.tar.xz mirror://gentoo/texlive-module-Type1fonts-2017.tar.xz mirror://gentoo/texlive-module-amslatex-primer-2017.tar.xz mirror://gentoo/texlive-module-around-the-bend-2017.tar.xz mirror://gentoo/texlive-module-ascii-chart-2017.tar.xz mirror://gentoo/texlive-module-biblatex-cheatsheet-2017.tar.xz mirror://gentoo/texlive-module-components-of-TeX-2017.tar.xz mirror://gentoo/texlive-module-comprehensive-2017.tar.xz mirror://gentoo/texlive-module-dickimaw-2017.tar.xz mirror://gentoo/texlive-module-docsurvey-2017.tar.xz mirror://gentoo/texlive-module-dtxtut-2017.tar.xz mirror://gentoo/texlive-module-first-latex-doc-2017.tar.xz mirror://gentoo/texlive-module-forest-quickstart-2017.tar.xz mirror://gentoo/texlive-module-gentle-2017.tar.xz mirror://gentoo/texlive-module-guide-to-latex-2017.tar.xz mirror://gentoo/texlive-module-happy4th-2017.tar.xz mirror://gentoo/texlive-module-impatient-2017.tar.xz mirror://gentoo/texlive-module-intro-scientific-2017.tar.xz mirror://gentoo/texlive-module-knuth-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-english-2017.tar.xz mirror://gentoo/texlive-module-latex-brochure-2017.tar.xz mirror://gentoo/texlive-module-latex-course-2017.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr-2017.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion-2017.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide-2017.tar.xz mirror://gentoo/texlive-module-latex-web-companion-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-2017.tar.xz mirror://gentoo/texlive-module-latexcourse-rug-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs-2017.tar.xz mirror://gentoo/texlive-module-lshort-english-2017.tar.xz mirror://gentoo/texlive-module-macros2e-2017.tar.xz mirror://gentoo/texlive-module-math-e-2017.tar.xz mirror://gentoo/texlive-module-math-into-latex-4-2017.tar.xz mirror://gentoo/texlive-module-maths-symbols-2017.tar.xz mirror://gentoo/texlive-module-memdesign-2017.tar.xz mirror://gentoo/texlive-module-metafont-beginners-2017.tar.xz mirror://gentoo/texlive-module-metapost-examples-2017.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial-2017.tar.xz mirror://gentoo/texlive-module-pictexsum-2017.tar.xz mirror://gentoo/texlive-module-plain-doc-2017.tar.xz mirror://gentoo/texlive-module-presentations-en-2017.tar.xz mirror://gentoo/texlive-module-simplified-latex-2017.tar.xz mirror://gentoo/texlive-module-svg-inkscape-2017.tar.xz mirror://gentoo/texlive-module-tabulars-e-2017.tar.xz mirror://gentoo/texlive-module-tamethebeast-2017.tar.xz mirror://gentoo/texlive-module-tds-2017.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet-2017.tar.xz mirror://gentoo/texlive-module-tex-overview-2017.tar.xz mirror://gentoo/texlive-module-tex-refs-2017.tar.xz mirror://gentoo/texlive-module-texbytopic-2017.tar.xz mirror://gentoo/texlive-module-titlepages-2017.tar.xz mirror://gentoo/texlive-module-tlc2-2017.tar.xz mirror://gentoo/texlive-module-undergradmath-2017.tar.xz mirror://gentoo/texlive-module-visualfaq-2017.tar.xz mirror://gentoo/texlive-module-webguide-2017.tar.xz mirror://gentoo/texlive-module-xetexref-2017.tar.xz mirror://gentoo/texlive-module-collection-langenglish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-FAQ-en.doc-2017.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles.doc-2017.tar.xz mirror://gentoo/texlive-module-Type1fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-amslatex-primer.doc-2017.tar.xz mirror://gentoo/texlive-module-around-the-bend.doc-2017.tar.xz mirror://gentoo/texlive-module-ascii-chart.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-cheatsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-components-of-TeX.doc-2017.tar.xz mirror://gentoo/texlive-module-comprehensive.doc-2017.tar.xz mirror://gentoo/texlive-module-dickimaw.doc-2017.tar.xz mirror://gentoo/texlive-module-docsurvey.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxtut.doc-2017.tar.xz mirror://gentoo/texlive-module-first-latex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-forest-quickstart.doc-2017.tar.xz mirror://gentoo/texlive-module-gentle.doc-2017.tar.xz mirror://gentoo/texlive-module-guide-to-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-happy4th.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient.doc-2017.tar.xz mirror://gentoo/texlive-module-intro-scientific.doc-2017.tar.xz mirror://gentoo/texlive-module-knuth.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-english.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-brochure.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-course.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-web-companion.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-latex4wp.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcourse-rug.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-english.doc-2017.tar.xz mirror://gentoo/texlive-module-macros2e.doc-2017.tar.xz mirror://gentoo/texlive-module-math-e.doc-2017.tar.xz mirror://gentoo/texlive-module-math-into-latex-4.doc-2017.tar.xz mirror://gentoo/texlive-module-maths-symbols.doc-2017.tar.xz mirror://gentoo/texlive-module-memdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-metafont-beginners.doc-2017.tar.xz mirror://gentoo/texlive-module-metapost-examples.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial.doc-2017.tar.xz mirror://gentoo/texlive-module-pictexsum.doc-2017.tar.xz mirror://gentoo/texlive-module-plain-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-presentations-en.doc-2017.tar.xz mirror://gentoo/texlive-module-simplified-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-svg-inkscape.doc-2017.tar.xz mirror://gentoo/texlive-module-tabulars-e.doc-2017.tar.xz mirror://gentoo/texlive-module-tamethebeast.doc-2017.tar.xz mirror://gentoo/texlive-module-tds.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-overview.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-refs.doc-2017.tar.xz mirror://gentoo/texlive-module-texbytopic.doc-2017.tar.xz mirror://gentoo/texlive-module-titlepages.doc-2017.tar.xz mirror://gentoo/texlive-module-tlc2.doc-2017.tar.xz mirror://gentoo/texlive-module-undergradmath.doc-2017.tar.xz mirror://gentoo/texlive-module-visualfaq.doc-2017.tar.xz mirror://gentoo/texlive-module-webguide.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexref.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-knuth.source-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d660d865320a245cc40f0da7e679f06a
+_md5_=6b090da47aef6c5cd06d1e9679b52868
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
index 46078782221f..3f80015708be 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
@@ -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 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-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !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-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-armtex-2017.tar.xz mirror://gentoo/texlive-module-babel-albanian-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian-2017.tar.xz mirror://gentoo/texlive-module-babel-breton-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian-2017.tar.xz mirror://gentoo/texlive-module-babel-danish-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan-2017.tar.xz mirror://gentoo/texlive-module-babel-hungarian-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic-2017.tar.xz mirror://gentoo/texlive-module-babel-irish-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji-2017.tar.xz mirror://gentoo/texlive-module-babel-latin-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh-2017.tar.xz mirror://gentoo/texlive-module-babel-samin-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh-2017.tar.xz mirror://gentoo/texlive-module-finbib-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan-2017.tar.xz mirror://gentoo/texlive-module-hrlatex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-croatian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-danish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-dutch-2017.tar.xz mirror://gentoo/texlive-module-hyphen-estonian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-finnish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-friulan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-icelandic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-irish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-kurmanji-2017.tar.xz mirror://gentoo/texlive-module-hyphen-latin-2017.tar.xz mirror://gentoo/texlive-module-hyphen-latvian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-lithuanian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-norwegian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-occitan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-piedmontese-2017.tar.xz mirror://gentoo/texlive-module-hyphen-romanian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-romansh-2017.tar.xz mirror://gentoo/texlive-module-hyphen-slovenian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-swedish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-uppersorbian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-welsh-2017.tar.xz mirror://gentoo/texlive-module-lithuanian-2017.tar.xz mirror://gentoo/texlive-module-lshort-dutch-2017.tar.xz mirror://gentoo/texlive-module-lshort-estonian-2017.tar.xz mirror://gentoo/texlive-module-lshort-finnish-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovenian-2017.tar.xz mirror://gentoo/texlive-module-lshort-turkish-2017.tar.xz mirror://gentoo/texlive-module-nevelok-2017.tar.xz mirror://gentoo/texlive-module-swebib-2017.tar.xz mirror://gentoo/texlive-module-turkmen-2017.tar.xz mirror://gentoo/texlive-module-collection-langeuropean-2017.tar.xz doc? ( mirror://gentoo/texlive-module-armtex.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-albanian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-breton.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-hungarian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-latin.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-samin.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh.doc-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan.doc-2017.tar.xz mirror://gentoo/texlive-module-hrlatex.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lithuanian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovenian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-nevelok.doc-2017.tar.xz mirror://gentoo/texlive-module-swebib.doc-2017.tar.xz mirror://gentoo/texlive-module-turkmen.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-albanian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-breton.source-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-danish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic.source-2017.tar.xz mirror://gentoo/texlive-module-babel-irish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.source-2017.tar.xz mirror://gentoo/texlive-module-babel-latin.source-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk.source-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.source-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh.source-2017.tar.xz mirror://gentoo/texlive-module-babel-samin.source-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh.source-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan.source-2017.tar.xz mirror://gentoo/texlive-module-hrlatex.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-nevelok.source-2017.tar.xz mirror://gentoo/texlive-module-turkmen.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=47370ec8ce3f550b28da74794f12cc57
+_md5_=72ae58ebf3275ce08343dd2c76ae9137
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2017 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
index 3053e1bf0dd5..bb0bb3f3abf0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive French
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-french !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aeguill-2017.tar.xz mirror://gentoo/texlive-module-apprends-latex-2017.tar.xz mirror://gentoo/texlive-module-babel-basque-2017.tar.xz mirror://gentoo/texlive-module-babel-french-2017.tar.xz mirror://gentoo/texlive-module-basque-book-2017.tar.xz mirror://gentoo/texlive-module-basque-date-2017.tar.xz mirror://gentoo/texlive-module-bib-fr-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french-2017.tar.xz mirror://gentoo/texlive-module-booktabs-fr-2017.tar.xz mirror://gentoo/texlive-module-droit-fr-2017.tar.xz mirror://gentoo/texlive-module-e-french-2017.tar.xz mirror://gentoo/texlive-module-epslatex-fr-2017.tar.xz mirror://gentoo/texlive-module-facture-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul-2017.tar.xz mirror://gentoo/texlive-module-frletter-2017.tar.xz mirror://gentoo/texlive-module-hyphen-basque-2017.tar.xz mirror://gentoo/texlive-module-hyphen-french-2017.tar.xz mirror://gentoo/texlive-module-impatient-fr-2017.tar.xz mirror://gentoo/texlive-module-impnattypo-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-french-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr-2017.tar.xz mirror://gentoo/texlive-module-lshort-french-2017.tar.xz mirror://gentoo/texlive-module-mafr-2017.tar.xz mirror://gentoo/texlive-module-tabvar-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath-2017.tar.xz mirror://gentoo/texlive-module-texlive-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-array-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr-2017.tar.xz mirror://gentoo/texlive-module-variations-2017.tar.xz mirror://gentoo/texlive-module-visualtikz-2017.tar.xz mirror://gentoo/texlive-module-collection-langfrench-2017.tar.xz doc? ( mirror://gentoo/texlive-module-aeguill.doc-2017.tar.xz mirror://gentoo/texlive-module-apprends-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-basque.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-french.doc-2017.tar.xz mirror://gentoo/texlive-module-basque-book.doc-2017.tar.xz mirror://gentoo/texlive-module-basque-date.doc-2017.tar.xz mirror://gentoo/texlive-module-bib-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-droit-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-e-french.doc-2017.tar.xz mirror://gentoo/texlive-module-epslatex-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-facture.doc-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.doc-2017.tar.xz mirror://gentoo/texlive-module-frletter.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-impnattypo.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-french.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-french.doc-2017.tar.xz mirror://gentoo/texlive-module-mafr.doc-2017.tar.xz mirror://gentoo/texlive-module-tabvar.doc-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-array-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-variations.doc-2017.tar.xz mirror://gentoo/texlive-module-visualtikz.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-basque.source-2017.tar.xz mirror://gentoo/texlive-module-babel-french.source-2017.tar.xz mirror://gentoo/texlive-module-basque-book.source-2017.tar.xz mirror://gentoo/texlive-module-basque-date.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french.source-2017.tar.xz mirror://gentoo/texlive-module-facture.source-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-basque.source-2017.tar.xz mirror://gentoo/texlive-module-impnattypo.source-2017.tar.xz mirror://gentoo/texlive-module-tabvar.source-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=726496befced804327eaeac602c6a165
+_md5_=72d840e9641c9ae62a8313140e6cfe67
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2017 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
index 51ec570fbfef..bb97ba0f9c21 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive German
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 MIT OPL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-latexextra-2009 !dev-texlive/texlive-documentation-german !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-apalike-german-2017.tar.xz mirror://gentoo/texlive-module-babel-german-2017.tar.xz mirror://gentoo/texlive-module-bibleref-german-2017.tar.xz mirror://gentoo/texlive-module-booktabs-de-2017.tar.xz mirror://gentoo/texlive-module-csquotes-de-2017.tar.xz mirror://gentoo/texlive-module-dehyph-exptl-2017.tar.xz mirror://gentoo/texlive-module-dhua-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung2-2017.tar.xz mirror://gentoo/texlive-module-etdipa-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-de-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info-2017.tar.xz mirror://gentoo/texlive-module-geometry-de-2017.tar.xz mirror://gentoo/texlive-module-german-2017.tar.xz mirror://gentoo/texlive-module-germbib-2017.tar.xz mirror://gentoo/texlive-module-germkorr-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura-2017.tar.xz mirror://gentoo/texlive-module-hyphen-german-2017.tar.xz mirror://gentoo/texlive-module-koma-script-examples-2017.tar.xz mirror://gentoo/texlive-module-l2picfaq-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-2017.tar.xz mirror://gentoo/texlive-module-latex-bib-ex-2017.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex-2017.tar.xz mirror://gentoo/texlive-module-latex-referenz-2017.tar.xz mirror://gentoo/texlive-module-latex-tabellen-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-de-2017.tar.xz mirror://gentoo/texlive-module-lshort-german-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de-2017.tar.xz mirror://gentoo/texlive-module-microtype-de-2017.tar.xz mirror://gentoo/texlive-module-milog-2017.tar.xz mirror://gentoo/texlive-module-presentations-2017.tar.xz mirror://gentoo/texlive-module-r_und_s-2017.tar.xz mirror://gentoo/texlive-module-templates-fenn-2017.tar.xz mirror://gentoo/texlive-module-templates-sommer-2017.tar.xz mirror://gentoo/texlive-module-texlive-de-2017.tar.xz mirror://gentoo/texlive-module-tipa-de-2017.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de-2017.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de-2017.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de-2017.tar.xz mirror://gentoo/texlive-module-translation-ecv-de-2017.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de-2017.tar.xz mirror://gentoo/texlive-module-translation-europecv-de-2017.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de-2017.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de-2017.tar.xz mirror://gentoo/texlive-module-udesoftec-2017.tar.xz mirror://gentoo/texlive-module-uhrzeit-2017.tar.xz mirror://gentoo/texlive-module-umlaute-2017.tar.xz mirror://gentoo/texlive-module-voss-mathcol-2017.tar.xz mirror://gentoo/texlive-module-collection-langgerman-2017.tar.xz doc? ( mirror://gentoo/texlive-module-apalike-german.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-german.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-german.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs-de.doc-2017.tar.xz mirror://gentoo/texlive-module-csquotes-de.doc-2017.tar.xz mirror://gentoo/texlive-module-dehyph-exptl.doc-2017.tar.xz mirror://gentoo/texlive-module-dhua.doc-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung.doc-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung2.doc-2017.tar.xz mirror://gentoo/texlive-module-etdipa.doc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-de.doc-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info.doc-2017.tar.xz mirror://gentoo/texlive-module-geometry-de.doc-2017.tar.xz mirror://gentoo/texlive-module-german.doc-2017.tar.xz mirror://gentoo/texlive-module-germbib.doc-2017.tar.xz mirror://gentoo/texlive-module-germkorr.doc-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-script-examples.doc-2017.tar.xz mirror://gentoo/texlive-module-l2picfaq.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bib-ex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-referenz.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-tabellen.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-de.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-german.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de.doc-2017.tar.xz mirror://gentoo/texlive-module-microtype-de.doc-2017.tar.xz mirror://gentoo/texlive-module-milog.doc-2017.tar.xz mirror://gentoo/texlive-module-presentations.doc-2017.tar.xz mirror://gentoo/texlive-module-r_und_s.doc-2017.tar.xz mirror://gentoo/texlive-module-templates-fenn.doc-2017.tar.xz mirror://gentoo/texlive-module-templates-sommer.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-de.doc-2017.tar.xz mirror://gentoo/texlive-module-tipa-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-ecv-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-europecv-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de.doc-2017.tar.xz mirror://gentoo/texlive-module-udesoftec.doc-2017.tar.xz mirror://gentoo/texlive-module-uhrzeit.doc-2017.tar.xz mirror://gentoo/texlive-module-umlaute.doc-2017.tar.xz mirror://gentoo/texlive-module-voss-mathcol.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-german.source-2017.tar.xz mirror://gentoo/texlive-module-dhua.source-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info.source-2017.tar.xz mirror://gentoo/texlive-module-german.source-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.source-2017.tar.xz mirror://gentoo/texlive-module-udesoftec.source-2017.tar.xz mirror://gentoo/texlive-module-umlaute.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88d42bc244edf68c0f64888ea3a44ad9
+_md5_=bbde60635ba5b1826e3f1f550b45bb93
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2017 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
index ff40289db9be..1dc0e30dfbe9 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Greek
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-greek-2017.tar.xz mirror://gentoo/texlive-module-begingreek-2017.tar.xz mirror://gentoo/texlive-module-betababel-2017.tar.xz mirror://gentoo/texlive-module-bgreek-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd-2017.tar.xz mirror://gentoo/texlive-module-gfsbaskerville-2017.tar.xz mirror://gentoo/texlive-module-gfsporson-2017.tar.xz mirror://gentoo/texlive-module-greek-fontenc-2017.tar.xz mirror://gentoo/texlive-module-greek-inputenc-2017.tar.xz mirror://gentoo/texlive-module-greekdates-2017.tar.xz mirror://gentoo/texlive-module-greektex-2017.tar.xz mirror://gentoo/texlive-module-greektonoi-2017.tar.xz mirror://gentoo/texlive-module-hyphen-greek-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ancientgreek-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel-2017.tar.xz mirror://gentoo/texlive-module-ibygrk-2017.tar.xz mirror://gentoo/texlive-module-kerkis-2017.tar.xz mirror://gentoo/texlive-module-levy-2017.tar.xz mirror://gentoo/texlive-module-lgreek-2017.tar.xz mirror://gentoo/texlive-module-mkgrkindex-2017.tar.xz mirror://gentoo/texlive-module-teubner-2017.tar.xz mirror://gentoo/texlive-module-xgreek-2017.tar.xz mirror://gentoo/texlive-module-yannisgr-2017.tar.xz mirror://gentoo/texlive-module-collection-langgreek-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-begingreek.doc-2017.tar.xz mirror://gentoo/texlive-module-betababel.doc-2017.tar.xz mirror://gentoo/texlive-module-bgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-cbfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsbaskerville.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsporson.doc-2017.tar.xz mirror://gentoo/texlive-module-greek-fontenc.doc-2017.tar.xz mirror://gentoo/texlive-module-greek-inputenc.doc-2017.tar.xz mirror://gentoo/texlive-module-greekdates.doc-2017.tar.xz mirror://gentoo/texlive-module-greektex.doc-2017.tar.xz mirror://gentoo/texlive-module-greektonoi.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-ibygrk.doc-2017.tar.xz mirror://gentoo/texlive-module-kerkis.doc-2017.tar.xz mirror://gentoo/texlive-module-levy.doc-2017.tar.xz mirror://gentoo/texlive-module-lgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-mkgrkindex.doc-2017.tar.xz mirror://gentoo/texlive-module-teubner.doc-2017.tar.xz mirror://gentoo/texlive-module-xgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-yannisgr.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-greek.source-2017.tar.xz mirror://gentoo/texlive-module-begingreek.source-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.source-2017.tar.xz mirror://gentoo/texlive-module-greekdates.source-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel.source-2017.tar.xz mirror://gentoo/texlive-module-teubner.source-2017.tar.xz mirror://gentoo/texlive-module-xgreek.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6d6c99305252c5bb2925427571d67b69
+_md5_=b9f448a3efb121f0e59390d17593956f
diff --git a/metadata/md5-cache/dev-texlive/texlive-langitalian-2017 b/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
index 7a8e8781403e..1b2db6cb0ed2 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Italian
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-italian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-it-2017.tar.xz mirror://gentoo/texlive-module-amsmath-it-2017.tar.xz mirror://gentoo/texlive-module-amsthdoc-it-2017.tar.xz mirror://gentoo/texlive-module-babel-italian-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-it-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph-2017.tar.xz mirror://gentoo/texlive-module-frontespizio-2017.tar.xz mirror://gentoo/texlive-module-hyphen-italian-2017.tar.xz mirror://gentoo/texlive-module-itnumpar-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-italian-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-it-2017.tar.xz mirror://gentoo/texlive-module-layaureo-2017.tar.xz mirror://gentoo/texlive-module-lshort-italian-2017.tar.xz mirror://gentoo/texlive-module-psfrag-italian-2017.tar.xz mirror://gentoo/texlive-module-texlive-it-2017.tar.xz mirror://gentoo/texlive-module-collection-langitalian-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-it.doc-2017.tar.xz mirror://gentoo/texlive-module-amsmath-it.doc-2017.tar.xz mirror://gentoo/texlive-module-amsthdoc-it.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-it.doc-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-frontespizio.doc-2017.tar.xz mirror://gentoo/texlive-module-itnumpar.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-it.doc-2017.tar.xz mirror://gentoo/texlive-module-layaureo.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-psfrag-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-it.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-italian.source-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.source-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph.source-2017.tar.xz mirror://gentoo/texlive-module-frontespizio.source-2017.tar.xz mirror://gentoo/texlive-module-itnumpar.source-2017.tar.xz mirror://gentoo/texlive-module-layaureo.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=694e7a301bb44c6df04139c0194f2521
+_md5_=8ab34e3b61cb50e7fb8d8bb8dbeff60f
diff --git a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017 b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
index 294c0a959bc6..501925c8fedc 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Japanese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 dev-lang/ruby >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-japanese-2017.tar.xz mirror://gentoo/texlive-module-bxbase-2017.tar.xz mirror://gentoo/texlive-module-bxcjkjatype-2017.tar.xz mirror://gentoo/texlive-module-bxjalipsum-2017.tar.xz mirror://gentoo/texlive-module-bxjscls-2017.tar.xz mirror://gentoo/texlive-module-bxorigcapt-2017.tar.xz mirror://gentoo/texlive-module-convbkmk-2017.tar.xz mirror://gentoo/texlive-module-ifptex-2017.tar.xz mirror://gentoo/texlive-module-ipaex-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex-2017.tar.xz mirror://gentoo/texlive-module-jlreq-2017.tar.xz mirror://gentoo/texlive-module-jsclasses-2017.tar.xz mirror://gentoo/texlive-module-lshort-japanese-2017.tar.xz mirror://gentoo/texlive-module-luatexja-2017.tar.xz mirror://gentoo/texlive-module-mendex-doc-2017.tar.xz mirror://gentoo/texlive-module-pbibtex-base-2017.tar.xz mirror://gentoo/texlive-module-platex-2017.tar.xz mirror://gentoo/texlive-module-platex-tools-2017.tar.xz mirror://gentoo/texlive-module-platexcheat-2017.tar.xz mirror://gentoo/texlive-module-ptex-2017.tar.xz mirror://gentoo/texlive-module-ptex-base-2017.tar.xz mirror://gentoo/texlive-module-ptex-fonts-2017.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps-2017.tar.xz mirror://gentoo/texlive-module-ptex2pdf-2017.tar.xz mirror://gentoo/texlive-module-pxbase-2017.tar.xz mirror://gentoo/texlive-module-pxchfon-2017.tar.xz mirror://gentoo/texlive-module-pxcjkcat-2017.tar.xz mirror://gentoo/texlive-module-pxjahyper-2017.tar.xz mirror://gentoo/texlive-module-pxrubrica-2017.tar.xz mirror://gentoo/texlive-module-uplatex-2017.tar.xz mirror://gentoo/texlive-module-uptex-2017.tar.xz mirror://gentoo/texlive-module-uptex-base-2017.tar.xz mirror://gentoo/texlive-module-uptex-fonts-2017.tar.xz mirror://gentoo/texlive-module-wadalab-2017.tar.xz mirror://gentoo/texlive-module-zxjafbfont-2017.tar.xz mirror://gentoo/texlive-module-zxjatype-2017.tar.xz mirror://gentoo/texlive-module-collection-langjapanese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-japanese.doc-2017.tar.xz mirror://gentoo/texlive-module-bxbase.doc-2017.tar.xz mirror://gentoo/texlive-module-bxcjkjatype.doc-2017.tar.xz mirror://gentoo/texlive-module-bxjalipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-bxjscls.doc-2017.tar.xz mirror://gentoo/texlive-module-bxorigcapt.doc-2017.tar.xz mirror://gentoo/texlive-module-convbkmk.doc-2017.tar.xz mirror://gentoo/texlive-module-ifptex.doc-2017.tar.xz mirror://gentoo/texlive-module-ipaex.doc-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf.doc-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex.doc-2017.tar.xz mirror://gentoo/texlive-module-jlreq.doc-2017.tar.xz mirror://gentoo/texlive-module-jsclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-japanese.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexja.doc-2017.tar.xz mirror://gentoo/texlive-module-mendex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-pbibtex-base.doc-2017.tar.xz mirror://gentoo/texlive-module-platex.doc-2017.tar.xz mirror://gentoo/texlive-module-platex-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-platexcheat.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex-base.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex2pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pxbase.doc-2017.tar.xz mirror://gentoo/texlive-module-pxchfon.doc-2017.tar.xz mirror://gentoo/texlive-module-pxcjkcat.doc-2017.tar.xz mirror://gentoo/texlive-module-pxjahyper.doc-2017.tar.xz mirror://gentoo/texlive-module-pxrubrica.doc-2017.tar.xz mirror://gentoo/texlive-module-uplatex.doc-2017.tar.xz mirror://gentoo/texlive-module-uptex.doc-2017.tar.xz mirror://gentoo/texlive-module-uptex-base.doc-2017.tar.xz mirror://gentoo/texlive-module-uptex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-wadalab.doc-2017.tar.xz mirror://gentoo/texlive-module-zxjafbfont.doc-2017.tar.xz mirror://gentoo/texlive-module-zxjatype.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-japanese.source-2017.tar.xz mirror://gentoo/texlive-module-bxjscls.source-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf.source-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex.source-2017.tar.xz mirror://gentoo/texlive-module-jsclasses.source-2017.tar.xz mirror://gentoo/texlive-module-luatexja.source-2017.tar.xz mirror://gentoo/texlive-module-platex.source-2017.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps.source-2017.tar.xz mirror://gentoo/texlive-module-pxrubrica.source-2017.tar.xz mirror://gentoo/texlive-module-uplatex.source-2017.tar.xz mirror://gentoo/texlive-module-uptex-fonts.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2732cb7b7f939480bccaf1c7fdb07cfd
+_md5_=2e8f571c59e615225bac1f47a449addd
diff --git a/metadata/md5-cache/dev-texlive/texlive-langkorean-2017 b/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
index 3c45c35542e7..97c51ba4e9c3 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Korean
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-baekmuk-2017.tar.xz mirror://gentoo/texlive-module-cjk-ko-2017.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir-2017.tar.xz mirror://gentoo/texlive-module-kotex-plain-2017.tar.xz mirror://gentoo/texlive-module-kotex-utf-2017.tar.xz mirror://gentoo/texlive-module-kotex-utils-2017.tar.xz mirror://gentoo/texlive-module-lshort-korean-2017.tar.xz mirror://gentoo/texlive-module-nanumtype1-2017.tar.xz mirror://gentoo/texlive-module-uhc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-core-2017.tar.xz mirror://gentoo/texlive-module-unfonts-extra-2017.tar.xz mirror://gentoo/texlive-module-collection-langkorean-2017.tar.xz doc? ( mirror://gentoo/texlive-module-baekmuk.doc-2017.tar.xz mirror://gentoo/texlive-module-cjk-ko.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-plain.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-utf.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-utils.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-korean.doc-2017.tar.xz mirror://gentoo/texlive-module-nanumtype1.doc-2017.tar.xz mirror://gentoo/texlive-module-uhc.doc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-core.doc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-extra.doc-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f869b5f82f5e79e9df3cb07b20d78d57
+_md5_=1d14b2a1c794f664524e334b67e71fc2
diff --git a/metadata/md5-cache/dev-texlive/texlive-langother-2017 b/metadata/md5-cache/dev-texlive/texlive-langother-2017
index f1fbc01469bd..c7fb967927a3 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langother-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langother-2017
@@ -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 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-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<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 !<dev-texlive/texlive-langafrican-2017 !<dev-texlive/texlive-langindic-2017 !<dev-texlive/texlive-langeuropean-2017 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-vn-2017.tar.xz mirror://gentoo/texlive-module-aramaic-serto-2017.tar.xz mirror://gentoo/texlive-module-hyphen-armenian-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto-2017.tar.xz mirror://gentoo/texlive-module-babel-georgian-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua-2017.tar.xz mirror://gentoo/texlive-module-babel-malay-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian-2017.tar.xz mirror://gentoo/texlive-module-babel-thai-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese-2017.tar.xz mirror://gentoo/texlive-module-bangtex-2017.tar.xz mirror://gentoo/texlive-module-bengali-2017.tar.xz mirror://gentoo/texlive-module-burmese-2017.tar.xz mirror://gentoo/texlive-module-cjhebrew-2017.tar.xz mirror://gentoo/texlive-module-ctib-2017.tar.xz mirror://gentoo/texlive-module-ebong-2017.tar.xz mirror://gentoo/texlive-module-ethiop-2017.tar.xz mirror://gentoo/texlive-module-ethiop-t1-2017.tar.xz mirror://gentoo/texlive-module-fc-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg-2017.tar.xz mirror://gentoo/texlive-module-hyphen-afrikaans-2017.tar.xz mirror://gentoo/texlive-module-hyphen-coptic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-esperanto-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-georgian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-indic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-indonesian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-interlingua-2017.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit-2017.tar.xz mirror://gentoo/texlive-module-hyphen-thai-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen-2017.tar.xz mirror://gentoo/texlive-module-latexbangla-2017.tar.xz mirror://gentoo/texlive-module-lshort-thai-2017.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-vn-2017.tar.xz mirror://gentoo/texlive-module-padauk-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-t1-2017.tar.xz mirror://gentoo/texlive-module-thaienum-2017.tar.xz mirror://gentoo/texlive-module-velthuis-2017.tar.xz mirror://gentoo/texlive-module-vntex-2017.tar.xz mirror://gentoo/texlive-module-wnri-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex-2017.tar.xz mirror://gentoo/texlive-module-xetex-devanagari-2017.tar.xz mirror://gentoo/texlive-module-collection-langother-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-vn.doc-2017.tar.xz mirror://gentoo/texlive-module-aramaic-serto.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-georgian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-malay.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-thai.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.doc-2017.tar.xz mirror://gentoo/texlive-module-bangtex.doc-2017.tar.xz mirror://gentoo/texlive-module-bengali.doc-2017.tar.xz mirror://gentoo/texlive-module-burmese.doc-2017.tar.xz mirror://gentoo/texlive-module-cjhebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-ctib.doc-2017.tar.xz mirror://gentoo/texlive-module-ebong.doc-2017.tar.xz mirror://gentoo/texlive-module-ethiop.doc-2017.tar.xz mirror://gentoo/texlive-module-ethiop-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-fc.doc-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit.doc-2017.tar.xz mirror://gentoo/texlive-module-latexbangla.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-thai.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese.doc-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-vn.doc-2017.tar.xz mirror://gentoo/texlive-module-padauk.doc-2017.tar.xz mirror://gentoo/texlive-module-sanskrit.doc-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-thaienum.doc-2017.tar.xz mirror://gentoo/texlive-module-velthuis.doc-2017.tar.xz mirror://gentoo/texlive-module-vntex.doc-2017.tar.xz mirror://gentoo/texlive-module-wnri.doc-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-devanagari.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-hyphen-armenian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani.source-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto.source-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew.source-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua.source-2017.tar.xz mirror://gentoo/texlive-module-babel-malay.source-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-thai.source-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.source-2017.tar.xz mirror://gentoo/texlive-module-bengali.source-2017.tar.xz mirror://gentoo/texlive-module-burmese.source-2017.tar.xz mirror://gentoo/texlive-module-ctib.source-2017.tar.xz mirror://gentoo/texlive-module-ethiop.source-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen.source-2017.tar.xz mirror://gentoo/texlive-module-sanskrit.source-2017.tar.xz mirror://gentoo/texlive-module-vntex.source-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ae66a7c700e711d37e7a8c9b80ac464
+_md5_=fda1520273dd71856148bff019cab5b7
diff --git a/metadata/md5-cache/dev-texlive/texlive-langpolish-2017 b/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
index 2a0473a6c296..61c26b223f83 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Polish
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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.2 LPPL-1.3 LPPL-1.3c public-domain TeX
 RDEPEND=>=dev-texlive/texlive-latex-2017 >=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-polish !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-polish-2017.tar.xz mirror://gentoo/texlive-module-bredzenie-2017.tar.xz mirror://gentoo/texlive-module-cc-pl-2017.tar.xz mirror://gentoo/texlive-module-gustlib-2017.tar.xz mirror://gentoo/texlive-module-gustprog-2017.tar.xz mirror://gentoo/texlive-module-hyphen-polish-2017.tar.xz mirror://gentoo/texlive-module-lshort-polish-2017.tar.xz mirror://gentoo/texlive-module-mex-2017.tar.xz mirror://gentoo/texlive-module-mwcls-2017.tar.xz mirror://gentoo/texlive-module-pl-2017.tar.xz mirror://gentoo/texlive-module-polski-2017.tar.xz mirror://gentoo/texlive-module-przechlewski-book-2017.tar.xz mirror://gentoo/texlive-module-qpxqtx-2017.tar.xz mirror://gentoo/texlive-module-tap-2017.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl-2017.tar.xz mirror://gentoo/texlive-module-texlive-pl-2017.tar.xz mirror://gentoo/texlive-module-utf8mex-2017.tar.xz mirror://gentoo/texlive-module-collection-langpolish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-bredzenie.doc-2017.tar.xz mirror://gentoo/texlive-module-cc-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-gustlib.doc-2017.tar.xz mirror://gentoo/texlive-module-gustprog.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-mex.doc-2017.tar.xz mirror://gentoo/texlive-module-mwcls.doc-2017.tar.xz mirror://gentoo/texlive-module-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-polski.doc-2017.tar.xz mirror://gentoo/texlive-module-przechlewski-book.doc-2017.tar.xz mirror://gentoo/texlive-module-qpxqtx.doc-2017.tar.xz mirror://gentoo/texlive-module-tap.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-utf8mex.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-polish.source-2017.tar.xz mirror://gentoo/texlive-module-mex.source-2017.tar.xz mirror://gentoo/texlive-module-mwcls.source-2017.tar.xz mirror://gentoo/texlive-module-polski.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4272f36a032d86352e3c60c9faa35152
+_md5_=bf84a737b652c0945001d774cef7b803
diff --git a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017 b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
index 8fbeac9aa640..d7e388bcae67 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Portuguese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-portuguese !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-portuges-2017.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt-2017.tar.xz mirror://gentoo/texlive-module-cursolatex-2017.tar.xz mirror://gentoo/texlive-module-feupphdteses-2017.tar.xz mirror://gentoo/texlive-module-hyphen-portuguese-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr-2017.tar.xz mirror://gentoo/texlive-module-lshort-portuguese-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt-2017.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt-2017.tar.xz mirror://gentoo/texlive-module-collection-langportuguese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt.doc-2017.tar.xz mirror://gentoo/texlive-module-cursolatex.doc-2017.tar.xz mirror://gentoo/texlive-module-feupphdteses.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-portuguese.doc-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt.doc-2017.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=343840d277001815fc19780aa3b12ae3
+_md5_=aa69bb891f7eca1f9dd7891bf74be007
diff --git a/metadata/md5-cache/dev-texlive/texlive-langspanish-2017 b/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
index 63c61fc17cec..ade4aed51a45 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Spanish
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-spanish !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-catalan-2017.tar.xz mirror://gentoo/texlive-module-babel-galician-2017.tar.xz mirror://gentoo/texlive-module-babel-spanglish-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish-2017.tar.xz mirror://gentoo/texlive-module-es-tex-faq-2017.tar.xz mirror://gentoo/texlive-module-hyphen-catalan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-galician-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx-2017.tar.xz mirror://gentoo/texlive-module-lshort-spanish-2017.tar.xz mirror://gentoo/texlive-module-spanish-mx-2017.tar.xz mirror://gentoo/texlive-module-texlive-es-2017.tar.xz mirror://gentoo/texlive-module-collection-langspanish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-catalan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-galician.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-spanglish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-es-tex-faq.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-spanish-mx.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-es.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-catalan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-galician.source-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-galician.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3703ab30f5d8060812a89b804fe4bdb9
+_md5_=86f07399f365020a84b09fd06817750a
diff --git a/metadata/md5-cache/dev-texlive/texlive-latex-2017 b/metadata/md5-cache/dev-texlive/texlive-latex-2017
index 48c324f3c8e7..9e4a7bf44cc3 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latex-2017
@@ -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 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.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !!<dev-texlive/texlive-latex-2016 !<dev-texlive/texlive-context-2010 !<dev-texlive/texlive-latexrecommended-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-ae-2017.tar.xz mirror://gentoo/texlive-module-amscls-2017.tar.xz mirror://gentoo/texlive-module-amsmath-2017.tar.xz mirror://gentoo/texlive-module-babel-2017.tar.xz mirror://gentoo/texlive-module-babel-english-2017.tar.xz mirror://gentoo/texlive-module-babelbib-2017.tar.xz mirror://gentoo/texlive-module-carlisle-2017.tar.xz mirror://gentoo/texlive-module-colortbl-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-2017.tar.xz mirror://gentoo/texlive-module-fix2col-2017.tar.xz mirror://gentoo/texlive-module-geometry-2017.tar.xz mirror://gentoo/texlive-module-graphics-2017.tar.xz mirror://gentoo/texlive-module-graphics-cfg-2017.tar.xz mirror://gentoo/texlive-module-hyperref-2017.tar.xz mirror://gentoo/texlive-module-latex-2017.tar.xz mirror://gentoo/texlive-module-latex-bin-2017.tar.xz mirror://gentoo/texlive-module-latex-fonts-2017.tar.xz mirror://gentoo/texlive-module-latexconfig-2017.tar.xz mirror://gentoo/texlive-module-ltxmisc-2017.tar.xz mirror://gentoo/texlive-module-mfnfss-2017.tar.xz mirror://gentoo/texlive-module-mptopdf-2017.tar.xz mirror://gentoo/texlive-module-natbib-2017.tar.xz mirror://gentoo/texlive-module-oberdiek-2017.tar.xz mirror://gentoo/texlive-module-pslatex-2017.tar.xz mirror://gentoo/texlive-module-psnfss-2017.tar.xz mirror://gentoo/texlive-module-pspicture-2017.tar.xz mirror://gentoo/texlive-module-tools-2017.tar.xz mirror://gentoo/texlive-module-url-2017.tar.xz mirror://gentoo/texlive-module-collection-latex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-ae.doc-2017.tar.xz mirror://gentoo/texlive-module-amscls.doc-2017.tar.xz mirror://gentoo/texlive-module-amsmath.doc-2017.tar.xz mirror://gentoo/texlive-module-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-english.doc-2017.tar.xz mirror://gentoo/texlive-module-babelbib.doc-2017.tar.xz mirror://gentoo/texlive-module-carlisle.doc-2017.tar.xz mirror://gentoo/texlive-module-colortbl.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr.doc-2017.tar.xz mirror://gentoo/texlive-module-fix2col.doc-2017.tar.xz mirror://gentoo/texlive-module-geometry.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-cfg.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperref.doc-2017.tar.xz mirror://gentoo/texlive-module-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bin.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-mfnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-mptopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-natbib.doc-2017.tar.xz mirror://gentoo/texlive-module-oberdiek.doc-2017.tar.xz mirror://gentoo/texlive-module-psnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-pspicture.doc-2017.tar.xz mirror://gentoo/texlive-module-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-url.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ae.source-2017.tar.xz mirror://gentoo/texlive-module-amscls.source-2017.tar.xz mirror://gentoo/texlive-module-amsmath.source-2017.tar.xz mirror://gentoo/texlive-module-babel.source-2017.tar.xz mirror://gentoo/texlive-module-babel-english.source-2017.tar.xz mirror://gentoo/texlive-module-carlisle.source-2017.tar.xz mirror://gentoo/texlive-module-colortbl.source-2017.tar.xz mirror://gentoo/texlive-module-fix2col.source-2017.tar.xz mirror://gentoo/texlive-module-geometry.source-2017.tar.xz mirror://gentoo/texlive-module-graphics.source-2017.tar.xz mirror://gentoo/texlive-module-hyperref.source-2017.tar.xz mirror://gentoo/texlive-module-latex.source-2017.tar.xz mirror://gentoo/texlive-module-mfnfss.source-2017.tar.xz mirror://gentoo/texlive-module-natbib.source-2017.tar.xz mirror://gentoo/texlive-module-oberdiek.source-2017.tar.xz mirror://gentoo/texlive-module-pslatex.source-2017.tar.xz mirror://gentoo/texlive-module-psnfss.source-2017.tar.xz mirror://gentoo/texlive-module-pspicture.source-2017.tar.xz mirror://gentoo/texlive-module-tools.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f434b82ed287160d4c7a4dc95c2d0bb
+_md5_=f1bfe0eb074dec54bf3d59ba55d29285
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexextra-2017 b/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
index b5fbfb7ab058..417d95567c1c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
@@ -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 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=Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latexrecommended-2017 >=dev-texlive/texlive-pictures-2017 >=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-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-2up-2017.tar.xz mirror://gentoo/texlive-module-ESIEEcv-2017.tar.xz mirror://gentoo/texlive-module-GS1-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper-2017.tar.xz mirror://gentoo/texlive-module-Tabbing-2017.tar.xz mirror://gentoo/texlive-module-a0poster-2017.tar.xz mirror://gentoo/texlive-module-a4wide-2017.tar.xz mirror://gentoo/texlive-module-a5comb-2017.tar.xz mirror://gentoo/texlive-module-abraces-2017.tar.xz mirror://gentoo/texlive-module-abstract-2017.tar.xz mirror://gentoo/texlive-module-achemso-2017.tar.xz mirror://gentoo/texlive-module-acro-2017.tar.xz mirror://gentoo/texlive-module-acronym-2017.tar.xz mirror://gentoo/texlive-module-acroterm-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol-2017.tar.xz mirror://gentoo/texlive-module-addfont-2017.tar.xz mirror://gentoo/texlive-module-addlines-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol-2017.tar.xz mirror://gentoo/texlive-module-adjustbox-2017.tar.xz mirror://gentoo/texlive-module-adrconv-2017.tar.xz mirror://gentoo/texlive-module-advdate-2017.tar.xz mirror://gentoo/texlive-module-akktex-2017.tar.xz mirror://gentoo/texlive-module-akletter-2017.tar.xz mirror://gentoo/texlive-module-alertmessage-2017.tar.xz mirror://gentoo/texlive-module-alnumsec-2017.tar.xz mirror://gentoo/texlive-module-alterqcm-2017.tar.xz mirror://gentoo/texlive-module-altfont-2017.tar.xz mirror://gentoo/texlive-module-amsaddr-2017.tar.xz mirror://gentoo/texlive-module-animate-2017.tar.xz mirror://gentoo/texlive-module-anonchap-2017.tar.xz mirror://gentoo/texlive-module-answers-2017.tar.xz mirror://gentoo/texlive-module-anyfontsize-2017.tar.xz mirror://gentoo/texlive-module-appendix-2017.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer-2017.tar.xz mirror://gentoo/texlive-module-apptools-2017.tar.xz mirror://gentoo/texlive-module-arcs-2017.tar.xz mirror://gentoo/texlive-module-arrayjobx-2017.tar.xz mirror://gentoo/texlive-module-arraysort-2017.tar.xz mirror://gentoo/texlive-module-arydshln-2017.tar.xz mirror://gentoo/texlive-module-asciilist-2017.tar.xz mirror://gentoo/texlive-module-assignment-2017.tar.xz mirror://gentoo/texlive-module-assoccnt-2017.tar.xz mirror://gentoo/texlive-module-attachfile-2017.tar.xz mirror://gentoo/texlive-module-aurl-2017.tar.xz mirror://gentoo/texlive-module-authoraftertitle-2017.tar.xz mirror://gentoo/texlive-module-authorindex-2017.tar.xz mirror://gentoo/texlive-module-autonum-2017.tar.xz mirror://gentoo/texlive-module-autopdf-2017.tar.xz mirror://gentoo/texlive-module-avremu-2017.tar.xz mirror://gentoo/texlive-module-background-2017.tar.xz mirror://gentoo/texlive-module-bankstatement-2017.tar.xz mirror://gentoo/texlive-module-bashful-2017.tar.xz mirror://gentoo/texlive-module-basicarith-2017.tar.xz mirror://gentoo/texlive-module-bchart-2017.tar.xz mirror://gentoo/texlive-module-beamer2thesis-2017.tar.xz mirror://gentoo/texlive-module-beameraudience-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl-2017.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes-2017.tar.xz mirror://gentoo/texlive-module-beamerposter-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc-2017.tar.xz mirror://gentoo/texlive-module-beamerthemejltree-2017.tar.xz mirror://gentoo/texlive-module-beamerthemenirma-2017.tar.xz mirror://gentoo/texlive-module-beton-2017.tar.xz mirror://gentoo/texlive-module-bewerbung-2017.tar.xz mirror://gentoo/texlive-module-bez123-2017.tar.xz mirror://gentoo/texlive-module-bezos-2017.tar.xz mirror://gentoo/texlive-module-bhcexam-2017.tar.xz mirror://gentoo/texlive-module-bibletext-2017.tar.xz mirror://gentoo/texlive-module-bigfoot-2017.tar.xz mirror://gentoo/texlive-module-bigints-2017.tar.xz mirror://gentoo/texlive-module-biochemistry-colors-2017.tar.xz mirror://gentoo/texlive-module-bizcard-2017.tar.xz mirror://gentoo/texlive-module-blindtext-2017.tar.xz mirror://gentoo/texlive-module-blkarray-2017.tar.xz mirror://gentoo/texlive-module-block-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr-2017.tar.xz mirror://gentoo/texlive-module-boites-2017.tar.xz mirror://gentoo/texlive-module-bold-extra-2017.tar.xz mirror://gentoo/texlive-module-bookcover-2017.tar.xz mirror://gentoo/texlive-module-bookest-2017.tar.xz mirror://gentoo/texlive-module-booklet-2017.tar.xz mirror://gentoo/texlive-module-boolexpr-2017.tar.xz mirror://gentoo/texlive-module-bophook-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e-2017.tar.xz mirror://gentoo/texlive-module-boxhandler-2017.tar.xz mirror://gentoo/texlive-module-bracketkey-2017.tar.xz mirror://gentoo/texlive-module-braket-2017.tar.xz mirror://gentoo/texlive-module-breakurl-2017.tar.xz mirror://gentoo/texlive-module-bullcntr-2017.tar.xz mirror://gentoo/texlive-module-bussproofs-2017.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer-2017.tar.xz mirror://gentoo/texlive-module-bxdvidriver-2017.tar.xz mirror://gentoo/texlive-module-bxenclose-2017.tar.xz mirror://gentoo/texlive-module-bxnewfont-2017.tar.xz mirror://gentoo/texlive-module-bxpapersize-2017.tar.xz mirror://gentoo/texlive-module-bxpdfver-2017.tar.xz mirror://gentoo/texlive-module-calcage-2017.tar.xz mirror://gentoo/texlive-module-calctab-2017.tar.xz mirror://gentoo/texlive-module-calculator-2017.tar.xz mirror://gentoo/texlive-module-calrsfs-2017.tar.xz mirror://gentoo/texlive-module-cals-2017.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy-2017.tar.xz mirror://gentoo/texlive-module-cancel-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout-2017.tar.xz mirror://gentoo/texlive-module-capt-of-2017.tar.xz mirror://gentoo/texlive-module-captcont-2017.tar.xz mirror://gentoo/texlive-module-captdef-2017.tar.xz mirror://gentoo/texlive-module-carbohydrates-2017.tar.xz mirror://gentoo/texlive-module-cases-2017.tar.xz mirror://gentoo/texlive-module-casyl-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags-2017.tar.xz mirror://gentoo/texlive-module-catechis-2017.tar.xz mirror://gentoo/texlive-module-catoptions-2017.tar.xz mirror://gentoo/texlive-module-cbcoptic-2017.tar.xz mirror://gentoo/texlive-module-ccaption-2017.tar.xz mirror://gentoo/texlive-module-cclicenses-2017.tar.xz mirror://gentoo/texlive-module-cd-2017.tar.xz mirror://gentoo/texlive-module-cd-cover-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl-2017.tar.xz mirror://gentoo/texlive-module-cellspace-2017.tar.xz mirror://gentoo/texlive-module-censor-2017.tar.xz mirror://gentoo/texlive-module-changebar-2017.tar.xz mirror://gentoo/texlive-module-changelayout-2017.tar.xz mirror://gentoo/texlive-module-changepage-2017.tar.xz mirror://gentoo/texlive-module-changes-2017.tar.xz mirror://gentoo/texlive-module-chappg-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder-2017.tar.xz mirror://gentoo/texlive-module-chet-2017.tar.xz mirror://gentoo/texlive-module-chextras-2017.tar.xz mirror://gentoo/texlive-module-childdoc-2017.tar.xz mirror://gentoo/texlive-module-chkfloat-2017.tar.xz mirror://gentoo/texlive-module-chletter-2017.tar.xz mirror://gentoo/texlive-module-chngcntr-2017.tar.xz mirror://gentoo/texlive-module-chronology-2017.tar.xz mirror://gentoo/texlive-module-circ-2017.tar.xz mirror://gentoo/texlive-module-classics-2017.tar.xz mirror://gentoo/texlive-module-classpack-2017.tar.xz mirror://gentoo/texlive-module-clefval-2017.tar.xz mirror://gentoo/texlive-module-cleveref-2017.tar.xz mirror://gentoo/texlive-module-clipboard-2017.tar.xz mirror://gentoo/texlive-module-clock-2017.tar.xz mirror://gentoo/texlive-module-cmdstring-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack-2017.tar.xz mirror://gentoo/texlive-module-cmsd-2017.tar.xz mirror://gentoo/texlive-module-cnltx-2017.tar.xz mirror://gentoo/texlive-module-cntformats-2017.tar.xz mirror://gentoo/texlive-module-cntperchap-2017.tar.xz mirror://gentoo/texlive-module-codedoc-2017.tar.xz mirror://gentoo/texlive-module-codepage-2017.tar.xz mirror://gentoo/texlive-module-codesection-2017.tar.xz mirror://gentoo/texlive-module-collcell-2017.tar.xz mirror://gentoo/texlive-module-collectbox-2017.tar.xz mirror://gentoo/texlive-module-colordoc-2017.tar.xz mirror://gentoo/texlive-module-colorinfo-2017.tar.xz mirror://gentoo/texlive-module-coloring-2017.tar.xz mirror://gentoo/texlive-module-colorspace-2017.tar.xz mirror://gentoo/texlive-module-colortab-2017.tar.xz mirror://gentoo/texlive-module-colorwav-2017.tar.xz mirror://gentoo/texlive-module-colorweb-2017.tar.xz mirror://gentoo/texlive-module-colourchange-2017.tar.xz mirror://gentoo/texlive-module-combelow-2017.tar.xz mirror://gentoo/texlive-module-combine-2017.tar.xz mirror://gentoo/texlive-module-comma-2017.tar.xz mirror://gentoo/texlive-module-commado-2017.tar.xz mirror://gentoo/texlive-module-comment-2017.tar.xz mirror://gentoo/texlive-module-concepts-2017.tar.xz mirror://gentoo/texlive-module-concprog-2017.tar.xz mirror://gentoo/texlive-module-constants-2017.tar.xz mirror://gentoo/texlive-module-continue-2017.tar.xz mirror://gentoo/texlive-module-contour-2017.tar.xz mirror://gentoo/texlive-module-contracard-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv-2017.tar.xz mirror://gentoo/texlive-module-cooking-2017.tar.xz mirror://gentoo/texlive-module-cooking-units-2017.tar.xz mirror://gentoo/texlive-module-cool-2017.tar.xz mirror://gentoo/texlive-module-coollist-2017.tar.xz mirror://gentoo/texlive-module-coolstr-2017.tar.xz mirror://gentoo/texlive-module-coolthms-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips-2017.tar.xz mirror://gentoo/texlive-module-coordsys-2017.tar.xz mirror://gentoo/texlive-module-copyedit-2017.tar.xz mirror://gentoo/texlive-module-copyrightbox-2017.tar.xz mirror://gentoo/texlive-module-coseoul-2017.tar.xz mirror://gentoo/texlive-module-counttexruns-2017.tar.xz mirror://gentoo/texlive-module-courseoutline-2017.tar.xz mirror://gentoo/texlive-module-coursepaper-2017.tar.xz mirror://gentoo/texlive-module-coverpage-2017.tar.xz mirror://gentoo/texlive-module-cprotect-2017.tar.xz mirror://gentoo/texlive-module-crbox-2017.tar.xz mirror://gentoo/texlive-module-crossreference-2017.tar.xz mirror://gentoo/texlive-module-csquotes-2017.tar.xz mirror://gentoo/texlive-module-css-colors-2017.tar.xz mirror://gentoo/texlive-module-csvsimple-2017.tar.xz mirror://gentoo/texlive-module-cuisine-2017.tar.xz mirror://gentoo/texlive-module-currfile-2017.tar.xz mirror://gentoo/texlive-module-cutwin-2017.tar.xz mirror://gentoo/texlive-module-cv-2017.tar.xz mirror://gentoo/texlive-module-cv4tw-2017.tar.xz mirror://gentoo/texlive-module-cweb-latex-2017.tar.xz mirror://gentoo/texlive-module-cyber-2017.tar.xz mirror://gentoo/texlive-module-cybercic-2017.tar.xz mirror://gentoo/texlive-module-dashbox-2017.tar.xz mirror://gentoo/texlive-module-dashrule-2017.tar.xz mirror://gentoo/texlive-module-dashundergaps-2017.tar.xz mirror://gentoo/texlive-module-dataref-2017.tar.xz mirror://gentoo/texlive-module-datatool-2017.tar.xz mirror://gentoo/texlive-module-dateiliste-2017.tar.xz mirror://gentoo/texlive-module-datenumber-2017.tar.xz mirror://gentoo/texlive-module-datetime-2017.tar.xz mirror://gentoo/texlive-module-datetime2-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh-2017.tar.xz mirror://gentoo/texlive-module-dblfloatfix-2017.tar.xz mirror://gentoo/texlive-module-decimal-2017.tar.xz mirror://gentoo/texlive-module-decorule-2017.tar.xz mirror://gentoo/texlive-module-delimtxt-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc-2017.tar.xz mirror://gentoo/texlive-module-diagbox-2017.tar.xz mirror://gentoo/texlive-module-diagnose-2017.tar.xz mirror://gentoo/texlive-module-dialogl-2017.tar.xz mirror://gentoo/texlive-module-dichokey-2017.tar.xz mirror://gentoo/texlive-module-dinbrief-2017.tar.xz mirror://gentoo/texlive-module-directory-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk-2017.tar.xz mirror://gentoo/texlive-module-dlfltxb-2017.tar.xz mirror://gentoo/texlive-module-dnaseq-2017.tar.xz mirror://gentoo/texlive-module-doclicense-2017.tar.xz mirror://gentoo/texlive-module-docmfp-2017.tar.xz mirror://gentoo/texlive-module-docmute-2017.tar.xz mirror://gentoo/texlive-module-doctools-2017.tar.xz mirror://gentoo/texlive-module-documentation-2017.tar.xz mirror://gentoo/texlive-module-doi-2017.tar.xz mirror://gentoo/texlive-module-dotarrow-2017.tar.xz mirror://gentoo/texlive-module-dotseqn-2017.tar.xz mirror://gentoo/texlive-module-download-2017.tar.xz mirror://gentoo/texlive-module-dox-2017.tar.xz mirror://gentoo/texlive-module-dpfloat-2017.tar.xz mirror://gentoo/texlive-module-dprogress-2017.tar.xz mirror://gentoo/texlive-module-drac-2017.tar.xz mirror://gentoo/texlive-module-draftcopy-2017.tar.xz mirror://gentoo/texlive-module-draftfigure-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark-2017.tar.xz mirror://gentoo/texlive-module-dtk-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery-2017.tar.xz mirror://gentoo/texlive-module-dvdcoll-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber-2017.tar.xz mirror://gentoo/texlive-module-dynblocks-2017.tar.xz mirror://gentoo/texlive-module-ean13isbn-2017.tar.xz mirror://gentoo/texlive-module-easy-2017.tar.xz mirror://gentoo/texlive-module-easy-todo-2017.tar.xz mirror://gentoo/texlive-module-easyfig-2017.tar.xz mirror://gentoo/texlive-module-easyformat-2017.tar.xz mirror://gentoo/texlive-module-easylist-2017.tar.xz mirror://gentoo/texlive-module-easyreview-2017.tar.xz mirror://gentoo/texlive-module-ebezier-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic-2017.tar.xz mirror://gentoo/texlive-module-ecv-2017.tar.xz mirror://gentoo/texlive-module-ed-2017.tar.xz mirror://gentoo/texlive-module-edmargin-2017.tar.xz mirror://gentoo/texlive-module-eemeir-2017.tar.xz mirror://gentoo/texlive-module-efbox-2017.tar.xz mirror://gentoo/texlive-module-egplot-2017.tar.xz mirror://gentoo/texlive-module-elements-2017.tar.xz mirror://gentoo/texlive-module-ellipsis-2017.tar.xz mirror://gentoo/texlive-module-elmath-2017.tar.xz mirror://gentoo/texlive-module-elocalloc-2017.tar.xz mirror://gentoo/texlive-module-elpres-2017.tar.xz mirror://gentoo/texlive-module-elzcards-2017.tar.xz mirror://gentoo/texlive-module-emarks-2017.tar.xz mirror://gentoo/texlive-module-embedall-2017.tar.xz mirror://gentoo/texlive-module-embrac-2017.tar.xz mirror://gentoo/texlive-module-emptypage-2017.tar.xz mirror://gentoo/texlive-module-emulateapj-2017.tar.xz mirror://gentoo/texlive-module-endfloat-2017.tar.xz mirror://gentoo/texlive-module-endheads-2017.tar.xz mirror://gentoo/texlive-module-endnotes-2017.tar.xz mirror://gentoo/texlive-module-engpron-2017.tar.xz mirror://gentoo/texlive-module-engrec-2017.tar.xz mirror://gentoo/texlive-module-enotez-2017.tar.xz mirror://gentoo/texlive-module-enumitem-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref-2017.tar.xz mirror://gentoo/texlive-module-envbig-2017.tar.xz mirror://gentoo/texlive-module-environ-2017.tar.xz mirror://gentoo/texlive-module-epigraph-2017.tar.xz mirror://gentoo/texlive-module-epiolmec-2017.tar.xz mirror://gentoo/texlive-module-eqell-2017.tar.xz mirror://gentoo/texlive-module-eqlist-2017.tar.xz mirror://gentoo/texlive-module-eqnalign-2017.tar.xz mirror://gentoo/texlive-module-eqname-2017.tar.xz mirror://gentoo/texlive-module-eqparbox-2017.tar.xz mirror://gentoo/texlive-module-errata-2017.tar.xz mirror://gentoo/texlive-module-esami-2017.tar.xz mirror://gentoo/texlive-module-esdiff-2017.tar.xz mirror://gentoo/texlive-module-esint-2017.tar.xz mirror://gentoo/texlive-module-esint-type1-2017.tar.xz mirror://gentoo/texlive-module-etaremune-2017.tar.xz mirror://gentoo/texlive-module-etextools-2017.tar.xz mirror://gentoo/texlive-module-etoc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-2017.tar.xz mirror://gentoo/texlive-module-eukdate-2017.tar.xz mirror://gentoo/texlive-module-eulerpx-2017.tar.xz mirror://gentoo/texlive-module-europasscv-2017.tar.xz mirror://gentoo/texlive-module-everyhook-2017.tar.xz mirror://gentoo/texlive-module-everypage-2017.tar.xz mirror://gentoo/texlive-module-exam-2017.tar.xz mirror://gentoo/texlive-module-exam-n-2017.tar.xz mirror://gentoo/texlive-module-examdesign-2017.tar.xz mirror://gentoo/texlive-module-example-2017.tar.xz mirror://gentoo/texlive-module-examplep-2017.tar.xz mirror://gentoo/texlive-module-exceltex-2017.tar.xz mirror://gentoo/texlive-module-excludeonly-2017.tar.xz mirror://gentoo/texlive-module-exercise-2017.tar.xz mirror://gentoo/texlive-module-exercises-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt-2017.tar.xz mirror://gentoo/texlive-module-expdlist-2017.tar.xz mirror://gentoo/texlive-module-export-2017.tar.xz mirror://gentoo/texlive-module-exsheets-2017.tar.xz mirror://gentoo/texlive-module-exsol-2017.tar.xz mirror://gentoo/texlive-module-extract-2017.tar.xz mirror://gentoo/texlive-module-facsimile-2017.tar.xz mirror://gentoo/texlive-module-factura-2017.tar.xz mirror://gentoo/texlive-module-fancylabel-2017.tar.xz mirror://gentoo/texlive-module-fancynum-2017.tar.xz mirror://gentoo/texlive-module-fancypar-2017.tar.xz mirror://gentoo/texlive-module-fancyslides-2017.tar.xz mirror://gentoo/texlive-module-fancytabs-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips-2017.tar.xz mirror://gentoo/texlive-module-fcolumn-2017.tar.xz mirror://gentoo/texlive-module-ffslides-2017.tar.xz mirror://gentoo/texlive-module-fgruler-2017.tar.xz mirror://gentoo/texlive-module-fibeamer-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack-2017.tar.xz mirror://gentoo/texlive-module-figsize-2017.tar.xz mirror://gentoo/texlive-module-filecontents-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef-2017.tar.xz mirror://gentoo/texlive-module-filedate-2017.tar.xz mirror://gentoo/texlive-module-fileinfo-2017.tar.xz mirror://gentoo/texlive-module-filemod-2017.tar.xz mirror://gentoo/texlive-module-fink-2017.tar.xz mirror://gentoo/texlive-module-finstrut-2017.tar.xz mirror://gentoo/texlive-module-fithesis-2017.tar.xz mirror://gentoo/texlive-module-fixcmex-2017.tar.xz mirror://gentoo/texlive-module-fixfoot-2017.tar.xz mirror://gentoo/texlive-module-fixme-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes-2017.tar.xz mirror://gentoo/texlive-module-fjodor-2017.tar.xz mirror://gentoo/texlive-module-flabels-2017.tar.xz mirror://gentoo/texlive-module-flacards-2017.tar.xz mirror://gentoo/texlive-module-flagderiv-2017.tar.xz mirror://gentoo/texlive-module-flashcards-2017.tar.xz mirror://gentoo/texlive-module-flashmovie-2017.tar.xz mirror://gentoo/texlive-module-flipbook-2017.tar.xz mirror://gentoo/texlive-module-flippdf-2017.tar.xz mirror://gentoo/texlive-module-floatflt-2017.tar.xz mirror://gentoo/texlive-module-floatrow-2017.tar.xz mirror://gentoo/texlive-module-flowfram-2017.tar.xz mirror://gentoo/texlive-module-fmp-2017.tar.xz mirror://gentoo/texlive-module-fmtcount-2017.tar.xz mirror://gentoo/texlive-module-fn2end-2017.tar.xz mirror://gentoo/texlive-module-fnbreak-2017.tar.xz mirror://gentoo/texlive-module-fncychap-2017.tar.xz mirror://gentoo/texlive-module-fncylab-2017.tar.xz mirror://gentoo/texlive-module-fnpara-2017.tar.xz mirror://gentoo/texlive-module-fnpct-2017.tar.xz mirror://gentoo/texlive-module-fnumprint-2017.tar.xz mirror://gentoo/texlive-module-foilhtml-2017.tar.xz mirror://gentoo/texlive-module-fontaxes-2017.tar.xz mirror://gentoo/texlive-module-fonttable-2017.tar.xz mirror://gentoo/texlive-module-footmisc-2017.tar.xz mirror://gentoo/texlive-module-footmisx-2017.tar.xz mirror://gentoo/texlive-module-footnotebackref-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper-2017.tar.xz mirror://gentoo/texlive-module-footnoterange-2017.tar.xz mirror://gentoo/texlive-module-footnpag-2017.tar.xz mirror://gentoo/texlive-module-forarray-2017.tar.xz mirror://gentoo/texlive-module-foreign-2017.tar.xz mirror://gentoo/texlive-module-forloop-2017.tar.xz mirror://gentoo/texlive-module-formlett-2017.tar.xz mirror://gentoo/texlive-module-formular-2017.tar.xz mirror://gentoo/texlive-module-fragments-2017.tar.xz mirror://gentoo/texlive-module-frame-2017.tar.xz mirror://gentoo/texlive-module-framed-2017.tar.xz mirror://gentoo/texlive-module-frankenstein-2017.tar.xz mirror://gentoo/texlive-module-frege-2017.tar.xz mirror://gentoo/texlive-module-ftcap-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra-2017.tar.xz mirror://gentoo/texlive-module-fullblck-2017.tar.xz mirror://gentoo/texlive-module-fullminipage-2017.tar.xz mirror://gentoo/texlive-module-fullwidth-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra-2017.tar.xz mirror://gentoo/texlive-module-fundus-cyr-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin-2017.tar.xz mirror://gentoo/texlive-module-fvextra-2017.tar.xz mirror://gentoo/texlive-module-fwlw-2017.tar.xz mirror://gentoo/texlive-module-gauss-2017.tar.xz mirror://gentoo/texlive-module-gcard-2017.tar.xz mirror://gentoo/texlive-module-gcite-2017.tar.xz mirror://gentoo/texlive-module-gender-2017.tar.xz mirror://gentoo/texlive-module-genmpage-2017.tar.xz mirror://gentoo/texlive-module-getfiledate-2017.tar.xz mirror://gentoo/texlive-module-getitems-2017.tar.xz mirror://gentoo/texlive-module-ginpenc-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info-2017.tar.xz mirror://gentoo/texlive-module-gitinfo-2017.tar.xz mirror://gentoo/texlive-module-gitinfo2-2017.tar.xz mirror://gentoo/texlive-module-gitlog-2017.tar.xz mirror://gentoo/texlive-module-gloss-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance-2017.tar.xz mirror://gentoo/texlive-module-gmiflink-2017.tar.xz mirror://gentoo/texlive-module-gmutils-2017.tar.xz mirror://gentoo/texlive-module-gmverb-2017.tar.xz mirror://gentoo/texlive-module-graphbox-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox-2017.tar.xz mirror://gentoo/texlive-module-grayhints-2017.tar.xz mirror://gentoo/texlive-module-grfpaste-2017.tar.xz mirror://gentoo/texlive-module-grid-2017.tar.xz mirror://gentoo/texlive-module-grid-system-2017.tar.xz mirror://gentoo/texlive-module-gridset-2017.tar.xz mirror://gentoo/texlive-module-guitlogo-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath-2017.tar.xz mirror://gentoo/texlive-module-handout-2017.tar.xz mirror://gentoo/texlive-module-hang-2017.tar.xz mirror://gentoo/texlive-module-hanging-2017.tar.xz mirror://gentoo/texlive-module-hardwrap-2017.tar.xz mirror://gentoo/texlive-module-harnon-cv-2017.tar.xz mirror://gentoo/texlive-module-harpoon-2017.tar.xz mirror://gentoo/texlive-module-hc-2017.tar.xz mirror://gentoo/texlive-module-he-she-2017.tar.xz mirror://gentoo/texlive-module-hhtensor-2017.tar.xz mirror://gentoo/texlive-module-histogr-2017.tar.xz mirror://gentoo/texlive-module-hitec-2017.tar.xz mirror://gentoo/texlive-module-hletter-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss-2017.tar.xz mirror://gentoo/texlive-module-hrefhide-2017.tar.xz mirror://gentoo/texlive-module-hvindex-2017.tar.xz mirror://gentoo/texlive-module-hypdvips-2017.tar.xz mirror://gentoo/texlive-module-hyper-2017.tar.xz mirror://gentoo/texlive-module-hypernat-2017.tar.xz mirror://gentoo/texlive-module-hyperref-docsrc-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp-2017.tar.xz mirror://gentoo/texlive-module-hyphenat-2017.tar.xz mirror://gentoo/texlive-module-idxcmds-2017.tar.xz mirror://gentoo/texlive-module-idxlayout-2017.tar.xz mirror://gentoo/texlive-module-iffont-2017.tar.xz mirror://gentoo/texlive-module-ifmslide-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg-2017.tar.xz mirror://gentoo/texlive-module-ifnextok-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage-2017.tar.xz mirror://gentoo/texlive-module-ifplatform-2017.tar.xz mirror://gentoo/texlive-module-ifthenx-2017.tar.xz mirror://gentoo/texlive-module-iitem-2017.tar.xz mirror://gentoo/texlive-module-image-gallery-2017.tar.xz mirror://gentoo/texlive-module-imakeidx-2017.tar.xz mirror://gentoo/texlive-module-import-2017.tar.xz mirror://gentoo/texlive-module-incgraph-2017.tar.xz mirror://gentoo/texlive-module-indextools-2017.tar.xz mirror://gentoo/texlive-module-inlinedef-2017.tar.xz mirror://gentoo/texlive-module-inputtrc-2017.tar.xz mirror://gentoo/texlive-module-interactiveworkbook-2017.tar.xz mirror://gentoo/texlive-module-interfaces-2017.tar.xz mirror://gentoo/texlive-module-inversepath-2017.tar.xz mirror://gentoo/texlive-module-invoice-2017.tar.xz mirror://gentoo/texlive-module-iso-2017.tar.xz mirror://gentoo/texlive-module-iso10303-2017.tar.xz mirror://gentoo/texlive-module-isodate-2017.tar.xz mirror://gentoo/texlive-module-isodoc-2017.tar.xz mirror://gentoo/texlive-module-isonums-2017.tar.xz mirror://gentoo/texlive-module-isorot-2017.tar.xz mirror://gentoo/texlive-module-isotope-2017.tar.xz mirror://gentoo/texlive-module-issuulinks-2017.tar.xz mirror://gentoo/texlive-module-iwhdp-2017.tar.xz mirror://gentoo/texlive-module-jlabels-2017.tar.xz mirror://gentoo/texlive-module-jslectureplanner-2017.tar.xz mirror://gentoo/texlive-module-jumplines-2017.tar.xz mirror://gentoo/texlive-module-jvlisting-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum-2017.tar.xz mirror://gentoo/texlive-module-kerntest-2017.tar.xz mirror://gentoo/texlive-module-keycommand-2017.tar.xz mirror://gentoo/texlive-module-keyfloat-2017.tar.xz mirror://gentoo/texlive-module-keyreader-2017.tar.xz mirror://gentoo/texlive-module-keystroke-2017.tar.xz mirror://gentoo/texlive-module-keyval2e-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable-2017.tar.xz mirror://gentoo/texlive-module-kix-2017.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic-2017.tar.xz mirror://gentoo/texlive-module-koma-script-sfs-2017.tar.xz mirror://gentoo/texlive-module-komacv-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata-2017.tar.xz mirror://gentoo/texlive-module-l3build-2017.tar.xz mirror://gentoo/texlive-module-labbook-2017.tar.xz mirror://gentoo/texlive-module-labels-2017.tar.xz mirror://gentoo/texlive-module-lastpackage-2017.tar.xz mirror://gentoo/texlive-module-lastpage-2017.tar.xz mirror://gentoo/texlive-module-latex-tds-2017.tar.xz mirror://gentoo/texlive-module-latexdemo-2017.tar.xz mirror://gentoo/texlive-module-latexgit-2017.tar.xz mirror://gentoo/texlive-module-layouts-2017.tar.xz mirror://gentoo/texlive-module-lazylist-2017.tar.xz mirror://gentoo/texlive-module-lcd-2017.tar.xz mirror://gentoo/texlive-module-lcg-2017.tar.xz mirror://gentoo/texlive-module-leading-2017.tar.xz mirror://gentoo/texlive-module-leftidx-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert-2017.tar.xz mirror://gentoo/texlive-module-lettre-2017.tar.xz mirror://gentoo/texlive-module-lettrine-2017.tar.xz mirror://gentoo/texlive-module-lewis-2017.tar.xz mirror://gentoo/texlive-module-lhelp-2017.tar.xz mirror://gentoo/texlive-module-libgreek-2017.tar.xz mirror://gentoo/texlive-module-limap-2017.tar.xz mirror://gentoo/texlive-module-linegoal-2017.tar.xz mirror://gentoo/texlive-module-linop-2017.tar.xz mirror://gentoo/texlive-module-lipsum-2017.tar.xz mirror://gentoo/texlive-module-lisp-on-tex-2017.tar.xz mirror://gentoo/texlive-module-listing-2017.tar.xz mirror://gentoo/texlive-module-listlbls-2017.tar.xz mirror://gentoo/texlive-module-listliketab-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols-2017.tar.xz mirror://gentoo/texlive-module-lkproof-2017.tar.xz mirror://gentoo/texlive-module-lmake-2017.tar.xz mirror://gentoo/texlive-module-locality-2017.tar.xz mirror://gentoo/texlive-module-localloc-2017.tar.xz mirror://gentoo/texlive-module-logbox-2017.tar.xz mirror://gentoo/texlive-module-logical-markup-utils-2017.tar.xz mirror://gentoo/texlive-module-logpap-2017.tar.xz mirror://gentoo/texlive-module-longfbox-2017.tar.xz mirror://gentoo/texlive-module-longfigure-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist-2017.tar.xz mirror://gentoo/texlive-module-loops-2017.tar.xz mirror://gentoo/texlive-module-lsc-2017.tar.xz mirror://gentoo/texlive-module-lstaddons-2017.tar.xz mirror://gentoo/texlive-module-lt3graph-2017.tar.xz mirror://gentoo/texlive-module-ltablex-2017.tar.xz mirror://gentoo/texlive-module-ltabptch-2017.tar.xz mirror://gentoo/texlive-module-ltxdockit-2017.tar.xz mirror://gentoo/texlive-module-ltxindex-2017.tar.xz mirror://gentoo/texlive-module-ltxkeys-2017.tar.xz mirror://gentoo/texlive-module-ltxnew-2017.tar.xz mirror://gentoo/texlive-module-ltxtools-2017.tar.xz mirror://gentoo/texlive-module-macroswap-2017.tar.xz mirror://gentoo/texlive-module-magaz-2017.tar.xz mirror://gentoo/texlive-module-mailing-2017.tar.xz mirror://gentoo/texlive-module-mailmerge-2017.tar.xz mirror://gentoo/texlive-module-makebarcode-2017.tar.xz mirror://gentoo/texlive-module-makebase-2017.tar.xz mirror://gentoo/texlive-module-makebox-2017.tar.xz mirror://gentoo/texlive-module-makecell-2017.tar.xz mirror://gentoo/texlive-module-makecirc-2017.tar.xz mirror://gentoo/texlive-module-makecmds-2017.tar.xz mirror://gentoo/texlive-module-makedtx-2017.tar.xz mirror://gentoo/texlive-module-makeglos-2017.tar.xz mirror://gentoo/texlive-module-mandi-2017.tar.xz mirror://gentoo/texlive-module-manfnt-2017.tar.xz mirror://gentoo/texlive-module-manuscript-2017.tar.xz mirror://gentoo/texlive-module-marginfix-2017.tar.xz mirror://gentoo/texlive-module-marginnote-2017.tar.xz mirror://gentoo/texlive-module-markdown-2017.tar.xz mirror://gentoo/texlive-module-mathalfa-2017.tar.xz mirror://gentoo/texlive-module-mathastext-2017.tar.xz mirror://gentoo/texlive-module-mathexam-2017.tar.xz mirror://gentoo/texlive-module-maybemath-2017.tar.xz mirror://gentoo/texlive-module-mbenotes-2017.tar.xz mirror://gentoo/texlive-module-mcaption-2017.tar.xz mirror://gentoo/texlive-module-mceinleger-2017.tar.xz mirror://gentoo/texlive-module-mcexam-2017.tar.xz mirror://gentoo/texlive-module-mcite-2017.tar.xz mirror://gentoo/texlive-module-mciteplus-2017.tar.xz mirror://gentoo/texlive-module-mdframed-2017.tar.xz mirror://gentoo/texlive-module-media9-2017.tar.xz mirror://gentoo/texlive-module-medstarbeamer-2017.tar.xz mirror://gentoo/texlive-module-meetingmins-2017.tar.xz mirror://gentoo/texlive-module-memexsupp-2017.tar.xz mirror://gentoo/texlive-module-memory-2017.tar.xz mirror://gentoo/texlive-module-menu-2017.tar.xz mirror://gentoo/texlive-module-menukeys-2017.tar.xz mirror://gentoo/texlive-module-method-2017.tar.xz mirror://gentoo/texlive-module-metre-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc-2017.tar.xz mirror://gentoo/texlive-module-mftinc-2017.tar.xz mirror://gentoo/texlive-module-midpage-2017.tar.xz mirror://gentoo/texlive-module-minibox-2017.tar.xz mirror://gentoo/texlive-module-minidocument-2017.tar.xz mirror://gentoo/texlive-module-minifp-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar-2017.tar.xz mirror://gentoo/texlive-module-minitoc-2017.tar.xz mirror://gentoo/texlive-module-minorrevision-2017.tar.xz mirror://gentoo/texlive-module-minted-2017.tar.xz mirror://gentoo/texlive-module-minutes-2017.tar.xz mirror://gentoo/texlive-module-mla-paper-2017.tar.xz mirror://gentoo/texlive-module-mlist-2017.tar.xz mirror://gentoo/texlive-module-mmap-2017.tar.xz mirror://gentoo/texlive-module-mnotes-2017.tar.xz mirror://gentoo/texlive-module-moderncv-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline-2017.tar.xz mirror://gentoo/texlive-module-modref-2017.tar.xz mirror://gentoo/texlive-module-modroman-2017.tar.xz mirror://gentoo/texlive-module-modular-2017.tar.xz mirror://gentoo/texlive-module-monofill-2017.tar.xz mirror://gentoo/texlive-module-moodle-2017.tar.xz mirror://gentoo/texlive-module-moreenum-2017.tar.xz mirror://gentoo/texlive-module-morefloats-2017.tar.xz mirror://gentoo/texlive-module-morehype-2017.tar.xz mirror://gentoo/texlive-module-moresize-2017.tar.xz mirror://gentoo/texlive-module-moreverb-2017.tar.xz mirror://gentoo/texlive-module-morewrites-2017.tar.xz mirror://gentoo/texlive-module-movie15-2017.tar.xz mirror://gentoo/texlive-module-mparhack-2017.tar.xz mirror://gentoo/texlive-module-mpostinl-2017.tar.xz mirror://gentoo/texlive-module-msc-2017.tar.xz mirror://gentoo/texlive-module-msg-2017.tar.xz mirror://gentoo/texlive-module-mslapa-2017.tar.xz mirror://gentoo/texlive-module-mtgreek-2017.tar.xz mirror://gentoo/texlive-module-multenum-2017.tar.xz mirror://gentoo/texlive-module-multiaudience-2017.tar.xz mirror://gentoo/texlive-module-multibbl-2017.tar.xz mirror://gentoo/texlive-module-multicap-2017.tar.xz mirror://gentoo/texlive-module-multidef-2017.tar.xz mirror://gentoo/texlive-module-multienv-2017.tar.xz mirror://gentoo/texlive-module-multiexpand-2017.tar.xz mirror://gentoo/texlive-module-multirow-2017.tar.xz mirror://gentoo/texlive-module-mversion-2017.tar.xz mirror://gentoo/texlive-module-mwe-2017.tar.xz mirror://gentoo/texlive-module-mycv-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat-2017.tar.xz mirror://gentoo/texlive-module-nag-2017.tar.xz mirror://gentoo/texlive-module-nameauth-2017.tar.xz mirror://gentoo/texlive-module-namespc-2017.tar.xz mirror://gentoo/texlive-module-ncclatex-2017.tar.xz mirror://gentoo/texlive-module-ncctools-2017.tar.xz mirror://gentoo/texlive-module-needspace-2017.tar.xz mirror://gentoo/texlive-module-nestquot-2017.tar.xz mirror://gentoo/texlive-module-newcommand-2017.tar.xz mirror://gentoo/texlive-module-newenviron-2017.tar.xz mirror://gentoo/texlive-module-newfile-2017.tar.xz mirror://gentoo/texlive-module-newlfm-2017.tar.xz mirror://gentoo/texlive-module-newspaper-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar-2017.tar.xz mirror://gentoo/texlive-module-newvbtm-2017.tar.xz mirror://gentoo/texlive-module-newverbs-2017.tar.xz mirror://gentoo/texlive-module-nextpage-2017.tar.xz mirror://gentoo/texlive-module-nfssext-cfr-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist-2017.tar.xz mirror://gentoo/texlive-module-niceframe-2017.tar.xz mirror://gentoo/texlive-module-nicetext-2017.tar.xz mirror://gentoo/texlive-module-nlctdoc-2017.tar.xz mirror://gentoo/texlive-module-noconflict-2017.tar.xz mirror://gentoo/texlive-module-noindentafter-2017.tar.xz mirror://gentoo/texlive-module-noitcrul-2017.tar.xz mirror://gentoo/texlive-module-nolbreaks-2017.tar.xz mirror://gentoo/texlive-module-nomencl-2017.tar.xz mirror://gentoo/texlive-module-nomentbl-2017.tar.xz mirror://gentoo/texlive-module-nonfloat-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart-2017.tar.xz mirror://gentoo/texlive-module-nopageno-2017.tar.xz mirror://gentoo/texlive-module-normalcolor-2017.tar.xz mirror://gentoo/texlive-module-notes-2017.tar.xz mirror://gentoo/texlive-module-notespages-2017.tar.xz mirror://gentoo/texlive-module-notoccite-2017.tar.xz mirror://gentoo/texlive-module-nowidow-2017.tar.xz mirror://gentoo/texlive-module-nox-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-2017.tar.xz mirror://gentoo/texlive-module-numberedblock-2017.tar.xz mirror://gentoo/texlive-module-numname-2017.tar.xz mirror://gentoo/texlive-module-numprint-2017.tar.xz mirror://gentoo/texlive-module-numspell-2017.tar.xz mirror://gentoo/texlive-module-ocg-p-2017.tar.xz mirror://gentoo/texlive-module-ocgx-2017.tar.xz mirror://gentoo/texlive-module-ocgx2-2017.tar.xz mirror://gentoo/texlive-module-ocr-latex-2017.tar.xz mirror://gentoo/texlive-module-octavo-2017.tar.xz mirror://gentoo/texlive-module-oldstyle-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath-2017.tar.xz mirror://gentoo/texlive-module-opcit-2017.tar.xz mirror://gentoo/texlive-module-optidef-2017.tar.xz mirror://gentoo/texlive-module-optional-2017.tar.xz mirror://gentoo/texlive-module-options-2017.tar.xz mirror://gentoo/texlive-module-outline-2017.tar.xz mirror://gentoo/texlive-module-outliner-2017.tar.xz mirror://gentoo/texlive-module-outlines-2017.tar.xz mirror://gentoo/texlive-module-overlays-2017.tar.xz mirror://gentoo/texlive-module-overpic-2017.tar.xz mirror://gentoo/texlive-module-pagecolor-2017.tar.xz mirror://gentoo/texlive-module-pagecont-2017.tar.xz mirror://gentoo/texlive-module-pagenote-2017.tar.xz mirror://gentoo/texlive-module-pagerange-2017.tar.xz mirror://gentoo/texlive-module-pageslts-2017.tar.xz mirror://gentoo/texlive-module-paper-2017.tar.xz mirror://gentoo/texlive-module-papercdcase-2017.tar.xz mirror://gentoo/texlive-module-papermas-2017.tar.xz mirror://gentoo/texlive-module-papertex-2017.tar.xz mirror://gentoo/texlive-module-paracol-2017.tar.xz mirror://gentoo/texlive-module-parades-2017.tar.xz mirror://gentoo/texlive-module-paralist-2017.tar.xz mirror://gentoo/texlive-module-paresse-2017.tar.xz mirror://gentoo/texlive-module-parnotes-2017.tar.xz mirror://gentoo/texlive-module-parselines-2017.tar.xz mirror://gentoo/texlive-module-pas-cours-2017.tar.xz mirror://gentoo/texlive-module-pas-cv-2017.tar.xz mirror://gentoo/texlive-module-pas-tableur-2017.tar.xz mirror://gentoo/texlive-module-patch-2017.tar.xz mirror://gentoo/texlive-module-patchcmd-2017.tar.xz mirror://gentoo/texlive-module-pauldoc-2017.tar.xz mirror://gentoo/texlive-module-pawpict-2017.tar.xz mirror://gentoo/texlive-module-pbox-2017.tar.xz mirror://gentoo/texlive-module-pbsheet-2017.tar.xz mirror://gentoo/texlive-module-pdf14-2017.tar.xz mirror://gentoo/texlive-module-pdfcomment-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot-2017.tar.xz mirror://gentoo/texlive-module-pdfmarginpar-2017.tar.xz mirror://gentoo/texlive-module-pdfpagediff-2017.tar.xz mirror://gentoo/texlive-module-pdfscreen-2017.tar.xz mirror://gentoo/texlive-module-pdfslide-2017.tar.xz mirror://gentoo/texlive-module-pdfsync-2017.tar.xz mirror://gentoo/texlive-module-pdfwin-2017.tar.xz mirror://gentoo/texlive-module-pdfx-2017.tar.xz mirror://gentoo/texlive-module-pecha-2017.tar.xz mirror://gentoo/texlive-module-perltex-2017.tar.xz mirror://gentoo/texlive-module-permute-2017.tar.xz mirror://gentoo/texlive-module-petiteannonce-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure-2017.tar.xz mirror://gentoo/texlive-module-phfnote-2017.tar.xz mirror://gentoo/texlive-module-phfparen-2017.tar.xz mirror://gentoo/texlive-module-phfqit-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark-2017.tar.xz mirror://gentoo/texlive-module-phfthm-2017.tar.xz mirror://gentoo/texlive-module-philex-2017.tar.xz mirror://gentoo/texlive-module-phonenumbers-2017.tar.xz mirror://gentoo/texlive-module-photo-2017.tar.xz mirror://gentoo/texlive-module-piff-2017.tar.xz mirror://gentoo/texlive-module-pkgloader-2017.tar.xz mirror://gentoo/texlive-module-placeins-2017.tar.xz mirror://gentoo/texlive-module-plantslabels-2017.tar.xz mirror://gentoo/texlive-module-plates-2017.tar.xz mirror://gentoo/texlive-module-plweb-2017.tar.xz mirror://gentoo/texlive-module-polynom-2017.tar.xz mirror://gentoo/texlive-module-polynomial-2017.tar.xz mirror://gentoo/texlive-module-polytable-2017.tar.xz mirror://gentoo/texlive-module-postcards-2017.tar.xz mirror://gentoo/texlive-module-poster-mac-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv-2017.tar.xz mirror://gentoo/texlive-module-preprint-2017.tar.xz mirror://gentoo/texlive-module-pressrelease-2017.tar.xz mirror://gentoo/texlive-module-prettyref-2017.tar.xz mirror://gentoo/texlive-module-preview-2017.tar.xz mirror://gentoo/texlive-module-printlen-2017.tar.xz mirror://gentoo/texlive-module-probsoln-2017.tar.xz mirror://gentoo/texlive-module-program-2017.tar.xz mirror://gentoo/texlive-module-progress-2017.tar.xz mirror://gentoo/texlive-module-progressbar-2017.tar.xz mirror://gentoo/texlive-module-proofread-2017.tar.xz mirror://gentoo/texlive-module-properties-2017.tar.xz mirror://gentoo/texlive-module-prosper-2017.tar.xz mirror://gentoo/texlive-module-protex-2017.tar.xz mirror://gentoo/texlive-module-protocol-2017.tar.xz mirror://gentoo/texlive-module-psfragx-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf-2017.tar.xz mirror://gentoo/texlive-module-pstool-2017.tar.xz mirror://gentoo/texlive-module-pstring-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks-2017.tar.xz mirror://gentoo/texlive-module-python-2017.tar.xz mirror://gentoo/texlive-module-qcm-2017.tar.xz mirror://gentoo/texlive-module-qstest-2017.tar.xz mirror://gentoo/texlive-module-qsymbols-2017.tar.xz mirror://gentoo/texlive-module-quicktype-2017.tar.xz mirror://gentoo/texlive-module-quotchap-2017.tar.xz mirror://gentoo/texlive-module-quoting-2017.tar.xz mirror://gentoo/texlive-module-quotmark-2017.tar.xz mirror://gentoo/texlive-module-ran_toks-2017.tar.xz mirror://gentoo/texlive-module-randtext-2017.tar.xz mirror://gentoo/texlive-module-rccol-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo-2017.tar.xz mirror://gentoo/texlive-module-readarray-2017.tar.xz mirror://gentoo/texlive-module-realboxes-2017.tar.xz mirror://gentoo/texlive-module-recipe-2017.tar.xz mirror://gentoo/texlive-module-recipebook-2017.tar.xz mirror://gentoo/texlive-module-recipecard-2017.tar.xz mirror://gentoo/texlive-module-rectopma-2017.tar.xz mirror://gentoo/texlive-module-refcheck-2017.tar.xz mirror://gentoo/texlive-module-refenums-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics-2017.tar.xz mirror://gentoo/texlive-module-refman-2017.tar.xz mirror://gentoo/texlive-module-refstyle-2017.tar.xz mirror://gentoo/texlive-module-regcount-2017.tar.xz mirror://gentoo/texlive-module-regexpatch-2017.tar.xz mirror://gentoo/texlive-module-register-2017.tar.xz mirror://gentoo/texlive-module-regstats-2017.tar.xz mirror://gentoo/texlive-module-relenc-2017.tar.xz mirror://gentoo/texlive-module-relsize-2017.tar.xz mirror://gentoo/texlive-module-repeatindex-2017.tar.xz mirror://gentoo/texlive-module-repltext-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap-2017.tar.xz mirror://gentoo/texlive-module-rlepsf-2017.tar.xz mirror://gentoo/texlive-module-rmpage-2017.tar.xz mirror://gentoo/texlive-module-robustcommand-2017.tar.xz mirror://gentoo/texlive-module-robustindex-2017.tar.xz mirror://gentoo/texlive-module-romanbar-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber-2017.tar.xz mirror://gentoo/texlive-module-romanneg-2017.tar.xz mirror://gentoo/texlive-module-romannum-2017.tar.xz mirror://gentoo/texlive-module-rotfloat-2017.tar.xz mirror://gentoo/texlive-module-rotpages-2017.tar.xz mirror://gentoo/texlive-module-roundbox-2017.tar.xz mirror://gentoo/texlive-module-rterface-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc-2017.tar.xz mirror://gentoo/texlive-module-rulercompass-2017.tar.xz mirror://gentoo/texlive-module-rvwrite-2017.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut-2017.tar.xz mirror://gentoo/texlive-module-sauerj-2017.tar.xz mirror://gentoo/texlive-module-savefnmark-2017.tar.xz mirror://gentoo/texlive-module-savesym-2017.tar.xz mirror://gentoo/texlive-module-savetrees-2017.tar.xz mirror://gentoo/texlive-module-scale-2017.tar.xz mirror://gentoo/texlive-module-scalebar-2017.tar.xz mirror://gentoo/texlive-module-scalerel-2017.tar.xz mirror://gentoo/texlive-module-scanpages-2017.tar.xz mirror://gentoo/texlive-module-scrlttr2copy-2017.tar.xz mirror://gentoo/texlive-module-sdrt-2017.tar.xz mirror://gentoo/texlive-module-secdot-2017.tar.xz mirror://gentoo/texlive-module-sectionbox-2017.tar.xz mirror://gentoo/texlive-module-sectsty-2017.tar.xz mirror://gentoo/texlive-module-seealso-2017.tar.xz mirror://gentoo/texlive-module-selectp-2017.tar.xz mirror://gentoo/texlive-module-semantic-2017.tar.xz mirror://gentoo/texlive-module-semantic-markup-2017.tar.xz mirror://gentoo/texlive-module-semioneside-2017.tar.xz mirror://gentoo/texlive-module-semproc-2017.tar.xz mirror://gentoo/texlive-module-sepfootnotes-2017.tar.xz mirror://gentoo/texlive-module-seqsplit-2017.tar.xz mirror://gentoo/texlive-module-sesstime-2017.tar.xz mirror://gentoo/texlive-module-sf298-2017.tar.xz mirror://gentoo/texlive-module-sffms-2017.tar.xz mirror://gentoo/texlive-module-sfmath-2017.tar.xz mirror://gentoo/texlive-module-shadethm-2017.tar.xz mirror://gentoo/texlive-module-shadow-2017.tar.xz mirror://gentoo/texlive-module-shadowtext-2017.tar.xz mirror://gentoo/texlive-module-shapepar-2017.tar.xz mirror://gentoo/texlive-module-shdoc-2017.tar.xz mirror://gentoo/texlive-module-shipunov-2017.tar.xz mirror://gentoo/texlive-module-shorttoc-2017.tar.xz mirror://gentoo/texlive-module-show2e-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox-2017.tar.xz mirror://gentoo/texlive-module-showdim-2017.tar.xz mirror://gentoo/texlive-module-showexpl-2017.tar.xz mirror://gentoo/texlive-module-showlabels-2017.tar.xz mirror://gentoo/texlive-module-sidecap-2017.tar.xz mirror://gentoo/texlive-module-sidenotes-2017.tar.xz mirror://gentoo/texlive-module-silence-2017.tar.xz mirror://gentoo/texlive-module-simplecd-2017.tar.xz mirror://gentoo/texlive-module-simplecv-2017.tar.xz mirror://gentoo/texlive-module-sitem-2017.tar.xz mirror://gentoo/texlive-module-skb-2017.tar.xz mirror://gentoo/texlive-module-skdoc-2017.tar.xz mirror://gentoo/texlive-module-skeycommand-2017.tar.xz mirror://gentoo/texlive-module-skeyval-2017.tar.xz mirror://gentoo/texlive-module-skrapport-2017.tar.xz mirror://gentoo/texlive-module-slantsc-2017.tar.xz mirror://gentoo/texlive-module-smalltableof-2017.tar.xz mirror://gentoo/texlive-module-smartunits-2017.tar.xz mirror://gentoo/texlive-module-smartref-2017.tar.xz mirror://gentoo/texlive-module-snapshot-2017.tar.xz mirror://gentoo/texlive-module-snotez-2017.tar.xz mirror://gentoo/texlive-module-soul-2017.tar.xz mirror://gentoo/texlive-module-sparklines-2017.tar.xz mirror://gentoo/texlive-module-sphack-2017.tar.xz mirror://gentoo/texlive-module-splitindex-2017.tar.xz mirror://gentoo/texlive-module-spot-2017.tar.xz mirror://gentoo/texlive-module-spotcolor-2017.tar.xz mirror://gentoo/texlive-module-spreadtab-2017.tar.xz mirror://gentoo/texlive-module-spverbatim-2017.tar.xz mirror://gentoo/texlive-module-srbook-mem-2017.tar.xz mirror://gentoo/texlive-module-srcltx-2017.tar.xz mirror://gentoo/texlive-module-sseq-2017.tar.xz mirror://gentoo/texlive-module-sslides-2017.tar.xz mirror://gentoo/texlive-module-stack-2017.tar.xz mirror://gentoo/texlive-module-stackengine-2017.tar.xz mirror://gentoo/texlive-module-standalone-2017.tar.xz mirror://gentoo/texlive-module-statistik-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv-2017.tar.xz mirror://gentoo/texlive-module-stdpage-2017.tar.xz mirror://gentoo/texlive-module-stex-2017.tar.xz mirror://gentoo/texlive-module-storebox-2017.tar.xz mirror://gentoo/texlive-module-storecmd-2017.tar.xz mirror://gentoo/texlive-module-stringstrings-2017.tar.xz mirror://gentoo/texlive-module-sttools-2017.tar.xz mirror://gentoo/texlive-module-stubs-2017.tar.xz mirror://gentoo/texlive-module-studenthandouts-2017.tar.xz mirror://gentoo/texlive-module-subdepth-2017.tar.xz mirror://gentoo/texlive-module-subeqn-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray-2017.tar.xz mirror://gentoo/texlive-module-subfigmat-2017.tar.xz mirror://gentoo/texlive-module-subfigure-2017.tar.xz mirror://gentoo/texlive-module-subfiles-2017.tar.xz mirror://gentoo/texlive-module-subfloat-2017.tar.xz mirror://gentoo/texlive-module-substitutefont-2017.tar.xz mirror://gentoo/texlive-module-substr-2017.tar.xz mirror://gentoo/texlive-module-supertabular-2017.tar.xz mirror://gentoo/texlive-module-svg-2017.tar.xz mirror://gentoo/texlive-module-svgcolor-2017.tar.xz mirror://gentoo/texlive-module-svn-2017.tar.xz mirror://gentoo/texlive-module-svn-multi-2017.tar.xz mirror://gentoo/texlive-module-svn-prov-2017.tar.xz mirror://gentoo/texlive-module-syntax-2017.tar.xz mirror://gentoo/texlive-module-syntrace-2017.tar.xz mirror://gentoo/texlive-module-synttree-2017.tar.xz mirror://gentoo/texlive-module-tabfigures-2017.tar.xz mirror://gentoo/texlive-module-tableaux-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote-2017.tar.xz mirror://gentoo/texlive-module-tableof-2017.tar.xz mirror://gentoo/texlive-module-tablestyles-2017.tar.xz mirror://gentoo/texlive-module-tablists-2017.tar.xz mirror://gentoo/texlive-module-tabls-2017.tar.xz mirror://gentoo/texlive-module-tabstackengine-2017.tar.xz mirror://gentoo/texlive-module-tabto-ltx-2017.tar.xz mirror://gentoo/texlive-module-tabu-2017.tar.xz mirror://gentoo/texlive-module-tabularborder-2017.tar.xz mirror://gentoo/texlive-module-tabularcalc-2017.tar.xz mirror://gentoo/texlive-module-tabularew-2017.tar.xz mirror://gentoo/texlive-module-tabulary-2017.tar.xz mirror://gentoo/texlive-module-tagging-2017.tar.xz mirror://gentoo/texlive-module-tagpair-2017.tar.xz mirror://gentoo/texlive-module-talk-2017.tar.xz mirror://gentoo/texlive-module-tamefloats-2017.tar.xz mirror://gentoo/texlive-module-tasks-2017.tar.xz mirror://gentoo/texlive-module-tcldoc-2017.tar.xz mirror://gentoo/texlive-module-tcolorbox-2017.tar.xz mirror://gentoo/texlive-module-tdclock-2017.tar.xz mirror://gentoo/texlive-module-technics-2017.tar.xz mirror://gentoo/texlive-module-ted-2017.tar.xz mirror://gentoo/texlive-module-templatetools-2017.tar.xz mirror://gentoo/texlive-module-termcal-2017.tar.xz mirror://gentoo/texlive-module-termlist-2017.tar.xz mirror://gentoo/texlive-module-testhyphens-2017.tar.xz mirror://gentoo/texlive-module-testidx-2017.tar.xz mirror://gentoo/texlive-module-tex-label-2017.tar.xz mirror://gentoo/texlive-module-texlogos-2017.tar.xz mirror://gentoo/texlive-module-texmate-2017.tar.xz mirror://gentoo/texlive-module-texments-2017.tar.xz mirror://gentoo/texlive-module-texpower-2017.tar.xz mirror://gentoo/texlive-module-texshade-2017.tar.xz mirror://gentoo/texlive-module-texvc-2017.tar.xz mirror://gentoo/texlive-module-textfit-2017.tar.xz mirror://gentoo/texlive-module-textmerg-2017.tar.xz mirror://gentoo/texlive-module-textpos-2017.tar.xz mirror://gentoo/texlive-module-theoremref-2017.tar.xz mirror://gentoo/texlive-module-thinsp-2017.tar.xz mirror://gentoo/texlive-module-thmtools-2017.tar.xz mirror://gentoo/texlive-module-threadcol-2017.tar.xz mirror://gentoo/texlive-module-threeparttable-2017.tar.xz mirror://gentoo/texlive-module-threeparttablex-2017.tar.xz mirror://gentoo/texlive-module-thumb-2017.tar.xz mirror://gentoo/texlive-module-thumbs-2017.tar.xz mirror://gentoo/texlive-module-thumby-2017.tar.xz mirror://gentoo/texlive-module-ticket-2017.tar.xz mirror://gentoo/texlive-module-titlecaps-2017.tar.xz mirror://gentoo/texlive-module-titlefoot-2017.tar.xz mirror://gentoo/texlive-module-titlepic-2017.tar.xz mirror://gentoo/texlive-module-titleref-2017.tar.xz mirror://gentoo/texlive-module-titlesec-2017.tar.xz mirror://gentoo/texlive-module-titling-2017.tar.xz mirror://gentoo/texlive-module-tocbibind-2017.tar.xz mirror://gentoo/texlive-module-tocdata-2017.tar.xz mirror://gentoo/texlive-module-tocloft-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2-2017.tar.xz mirror://gentoo/texlive-module-todo-2017.tar.xz mirror://gentoo/texlive-module-todonotes-2017.tar.xz mirror://gentoo/texlive-module-tokenizer-2017.tar.xz mirror://gentoo/texlive-module-toolbox-2017.tar.xz mirror://gentoo/texlive-module-topfloat-2017.tar.xz mirror://gentoo/texlive-module-totcount-2017.tar.xz mirror://gentoo/texlive-module-totpages-2017.tar.xz mirror://gentoo/texlive-module-translations-2017.tar.xz mirror://gentoo/texlive-module-trfsigns-2017.tar.xz mirror://gentoo/texlive-module-trimspaces-2017.tar.xz mirror://gentoo/texlive-module-trivfloat-2017.tar.xz mirror://gentoo/texlive-module-trsym-2017.tar.xz mirror://gentoo/texlive-module-truncate-2017.tar.xz mirror://gentoo/texlive-module-tucv-2017.tar.xz mirror://gentoo/texlive-module-turnthepage-2017.tar.xz mirror://gentoo/texlive-module-twoinone-2017.tar.xz mirror://gentoo/texlive-module-twoup-2017.tar.xz mirror://gentoo/texlive-module-txgreeks-2017.tar.xz mirror://gentoo/texlive-module-type1cm-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist-2017.tar.xz mirror://gentoo/texlive-module-typeface-2017.tar.xz mirror://gentoo/texlive-module-typoaid-2017.tar.xz mirror://gentoo/texlive-module-typogrid-2017.tar.xz mirror://gentoo/texlive-module-uassign-2017.tar.xz mirror://gentoo/texlive-module-ucs-2017.tar.xz mirror://gentoo/texlive-module-uebungsblatt-2017.tar.xz mirror://gentoo/texlive-module-umoline-2017.tar.xz mirror://gentoo/texlive-module-underlin-2017.tar.xz mirror://gentoo/texlive-module-underoverlap-2017.tar.xz mirror://gentoo/texlive-module-undolabl-2017.tar.xz mirror://gentoo/texlive-module-units-2017.tar.xz mirror://gentoo/texlive-module-unravel-2017.tar.xz mirror://gentoo/texlive-module-upmethodology-2017.tar.xz mirror://gentoo/texlive-module-upquote-2017.tar.xz mirror://gentoo/texlive-module-uri-2017.tar.xz mirror://gentoo/texlive-module-ushort-2017.tar.xz mirror://gentoo/texlive-module-uspace-2017.tar.xz mirror://gentoo/texlive-module-uwmslide-2017.tar.xz mirror://gentoo/texlive-module-variablelm-2017.tar.xz mirror://gentoo/texlive-module-varindex-2017.tar.xz mirror://gentoo/texlive-module-varsfromjobname-2017.tar.xz mirror://gentoo/texlive-module-varwidth-2017.tar.xz mirror://gentoo/texlive-module-vdmlisting-2017.tar.xz mirror://gentoo/texlive-module-verbasef-2017.tar.xz mirror://gentoo/texlive-module-verbatimbox-2017.tar.xz mirror://gentoo/texlive-module-verbatimcopy-2017.tar.xz mirror://gentoo/texlive-module-verbdef-2017.tar.xz mirror://gentoo/texlive-module-verbments-2017.tar.xz mirror://gentoo/texlive-module-version-2017.tar.xz mirror://gentoo/texlive-module-versions-2017.tar.xz mirror://gentoo/texlive-module-versonotes-2017.tar.xz mirror://gentoo/texlive-module-vertbars-2017.tar.xz mirror://gentoo/texlive-module-vgrid-2017.tar.xz mirror://gentoo/texlive-module-vhistory-2017.tar.xz mirror://gentoo/texlive-module-vmargin-2017.tar.xz mirror://gentoo/texlive-module-volumes-2017.tar.xz mirror://gentoo/texlive-module-vpe-2017.tar.xz mirror://gentoo/texlive-module-vruler-2017.tar.xz mirror://gentoo/texlive-module-vwcol-2017.tar.xz mirror://gentoo/texlive-module-wallpaper-2017.tar.xz mirror://gentoo/texlive-module-warning-2017.tar.xz mirror://gentoo/texlive-module-warpcol-2017.tar.xz mirror://gentoo/texlive-module-was-2017.tar.xz mirror://gentoo/texlive-module-widetable-2017.tar.xz mirror://gentoo/texlive-module-williams-2017.tar.xz mirror://gentoo/texlive-module-withargs-2017.tar.xz mirror://gentoo/texlive-module-wordcount-2017.tar.xz mirror://gentoo/texlive-module-wordlike-2017.tar.xz mirror://gentoo/texlive-module-wrapfig-2017.tar.xz mirror://gentoo/texlive-module-wtref-2017.tar.xz mirror://gentoo/texlive-module-xargs-2017.tar.xz mirror://gentoo/texlive-module-xassoccnt-2017.tar.xz mirror://gentoo/texlive-module-xcntperchap-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized-2017.tar.xz mirror://gentoo/texlive-module-xcomment-2017.tar.xz mirror://gentoo/texlive-module-xdoc-2017.tar.xz mirror://gentoo/texlive-module-xellipsis-2017.tar.xz mirror://gentoo/texlive-module-xfor-2017.tar.xz mirror://gentoo/texlive-module-xhfill-2017.tar.xz mirror://gentoo/texlive-module-xifthen-2017.tar.xz mirror://gentoo/texlive-module-xint-2017.tar.xz mirror://gentoo/texlive-module-xmpincl-2017.tar.xz mirror://gentoo/texlive-module-xnewcommand-2017.tar.xz mirror://gentoo/texlive-module-xoptarg-2017.tar.xz mirror://gentoo/texlive-module-xpatch-2017.tar.xz mirror://gentoo/texlive-module-xpeek-2017.tar.xz mirror://gentoo/texlive-module-xprintlen-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate-2017.tar.xz mirror://gentoo/texlive-module-xsavebox-2017.tar.xz mirror://gentoo/texlive-module-xsim-2017.tar.xz mirror://gentoo/texlive-module-xstring-2017.tar.xz mirror://gentoo/texlive-module-xtab-2017.tar.xz mirror://gentoo/texlive-module-xwatermark-2017.tar.xz mirror://gentoo/texlive-module-xytree-2017.tar.xz mirror://gentoo/texlive-module-yafoot-2017.tar.xz mirror://gentoo/texlive-module-yaletter-2017.tar.xz mirror://gentoo/texlive-module-yagusylo-2017.tar.xz mirror://gentoo/texlive-module-ycbook-2017.tar.xz mirror://gentoo/texlive-module-ydoc-2017.tar.xz mirror://gentoo/texlive-module-yplan-2017.tar.xz mirror://gentoo/texlive-module-zed-csp-2017.tar.xz mirror://gentoo/texlive-module-ziffer-2017.tar.xz mirror://gentoo/texlive-module-zwgetfdate-2017.tar.xz mirror://gentoo/texlive-module-zwpagelayout-2017.tar.xz mirror://gentoo/texlive-module-collection-latexextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-2up.doc-2017.tar.xz mirror://gentoo/texlive-module-ESIEEcv.doc-2017.tar.xz mirror://gentoo/texlive-module-GS1.doc-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper.doc-2017.tar.xz mirror://gentoo/texlive-module-Tabbing.doc-2017.tar.xz mirror://gentoo/texlive-module-a0poster.doc-2017.tar.xz mirror://gentoo/texlive-module-a4wide.doc-2017.tar.xz mirror://gentoo/texlive-module-a5comb.doc-2017.tar.xz mirror://gentoo/texlive-module-abraces.doc-2017.tar.xz mirror://gentoo/texlive-module-abstract.doc-2017.tar.xz mirror://gentoo/texlive-module-achemso.doc-2017.tar.xz mirror://gentoo/texlive-module-acro.doc-2017.tar.xz mirror://gentoo/texlive-module-acronym.doc-2017.tar.xz mirror://gentoo/texlive-module-acroterm.doc-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle.doc-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-addfont.doc-2017.tar.xz mirror://gentoo/texlive-module-addlines.doc-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol.doc-2017.tar.xz mirror://gentoo/texlive-module-adjustbox.doc-2017.tar.xz mirror://gentoo/texlive-module-adrconv.doc-2017.tar.xz mirror://gentoo/texlive-module-advdate.doc-2017.tar.xz mirror://gentoo/texlive-module-akktex.doc-2017.tar.xz mirror://gentoo/texlive-module-akletter.doc-2017.tar.xz mirror://gentoo/texlive-module-alertmessage.doc-2017.tar.xz mirror://gentoo/texlive-module-alnumsec.doc-2017.tar.xz mirror://gentoo/texlive-module-alterqcm.doc-2017.tar.xz mirror://gentoo/texlive-module-altfont.doc-2017.tar.xz mirror://gentoo/texlive-module-amsaddr.doc-2017.tar.xz mirror://gentoo/texlive-module-animate.doc-2017.tar.xz mirror://gentoo/texlive-module-anonchap.doc-2017.tar.xz mirror://gentoo/texlive-module-answers.doc-2017.tar.xz mirror://gentoo/texlive-module-anyfontsize.doc-2017.tar.xz mirror://gentoo/texlive-module-appendix.doc-2017.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-apptools.doc-2017.tar.xz mirror://gentoo/texlive-module-arcs.doc-2017.tar.xz mirror://gentoo/texlive-module-arrayjobx.doc-2017.tar.xz mirror://gentoo/texlive-module-arraysort.doc-2017.tar.xz mirror://gentoo/texlive-module-arydshln.doc-2017.tar.xz mirror://gentoo/texlive-module-asciilist.doc-2017.tar.xz mirror://gentoo/texlive-module-assignment.doc-2017.tar.xz mirror://gentoo/texlive-module-assoccnt.doc-2017.tar.xz mirror://gentoo/texlive-module-attachfile.doc-2017.tar.xz mirror://gentoo/texlive-module-aurl.doc-2017.tar.xz mirror://gentoo/texlive-module-authoraftertitle.doc-2017.tar.xz mirror://gentoo/texlive-module-authorindex.doc-2017.tar.xz mirror://gentoo/texlive-module-autonum.doc-2017.tar.xz mirror://gentoo/texlive-module-autopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-avremu.doc-2017.tar.xz mirror://gentoo/texlive-module-background.doc-2017.tar.xz mirror://gentoo/texlive-module-bankstatement.doc-2017.tar.xz mirror://gentoo/texlive-module-bashful.doc-2017.tar.xz mirror://gentoo/texlive-module-basicarith.doc-2017.tar.xz mirror://gentoo/texlive-module-bchart.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer2thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-beameraudience.doc-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerposter.doc-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerthemenirma.doc-2017.tar.xz mirror://gentoo/texlive-module-beton.doc-2017.tar.xz mirror://gentoo/texlive-module-bewerbung.doc-2017.tar.xz mirror://gentoo/texlive-module-bez123.doc-2017.tar.xz mirror://gentoo/texlive-module-bezos.doc-2017.tar.xz mirror://gentoo/texlive-module-bhcexam.doc-2017.tar.xz mirror://gentoo/texlive-module-bibletext.doc-2017.tar.xz mirror://gentoo/texlive-module-bigfoot.doc-2017.tar.xz mirror://gentoo/texlive-module-bigints.doc-2017.tar.xz mirror://gentoo/texlive-module-biochemistry-colors.doc-2017.tar.xz mirror://gentoo/texlive-module-bizcard.doc-2017.tar.xz mirror://gentoo/texlive-module-blindtext.doc-2017.tar.xz mirror://gentoo/texlive-module-blkarray.doc-2017.tar.xz mirror://gentoo/texlive-module-block.doc-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr.doc-2017.tar.xz mirror://gentoo/texlive-module-boites.doc-2017.tar.xz mirror://gentoo/texlive-module-bold-extra.doc-2017.tar.xz mirror://gentoo/texlive-module-bookcover.doc-2017.tar.xz mirror://gentoo/texlive-module-bookest.doc-2017.tar.xz mirror://gentoo/texlive-module-booklet.doc-2017.tar.xz mirror://gentoo/texlive-module-boolexpr.doc-2017.tar.xz mirror://gentoo/texlive-module-bophook.doc-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage.doc-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.doc-2017.tar.xz mirror://gentoo/texlive-module-boxhandler.doc-2017.tar.xz mirror://gentoo/texlive-module-bracketkey.doc-2017.tar.xz mirror://gentoo/texlive-module-braket.doc-2017.tar.xz mirror://gentoo/texlive-module-breakurl.doc-2017.tar.xz mirror://gentoo/texlive-module-bullcntr.doc-2017.tar.xz mirror://gentoo/texlive-module-bussproofs.doc-2017.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer.doc-2017.tar.xz mirror://gentoo/texlive-module-bxdvidriver.doc-2017.tar.xz mirror://gentoo/texlive-module-bxenclose.doc-2017.tar.xz mirror://gentoo/texlive-module-bxnewfont.doc-2017.tar.xz mirror://gentoo/texlive-module-bxpapersize.doc-2017.tar.xz mirror://gentoo/texlive-module-bxpdfver.doc-2017.tar.xz mirror://gentoo/texlive-module-calcage.doc-2017.tar.xz mirror://gentoo/texlive-module-calctab.doc-2017.tar.xz mirror://gentoo/texlive-module-calculator.doc-2017.tar.xz mirror://gentoo/texlive-module-calrsfs.doc-2017.tar.xz mirror://gentoo/texlive-module-cals.doc-2017.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy.doc-2017.tar.xz mirror://gentoo/texlive-module-cancel.doc-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout.doc-2017.tar.xz mirror://gentoo/texlive-module-capt-of.doc-2017.tar.xz mirror://gentoo/texlive-module-captcont.doc-2017.tar.xz mirror://gentoo/texlive-module-captdef.doc-2017.tar.xz mirror://gentoo/texlive-module-carbohydrates.doc-2017.tar.xz mirror://gentoo/texlive-module-cases.doc-2017.tar.xz mirror://gentoo/texlive-module-casyl.doc-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.doc-2017.tar.xz mirror://gentoo/texlive-module-catechis.doc-2017.tar.xz mirror://gentoo/texlive-module-catoptions.doc-2017.tar.xz mirror://gentoo/texlive-module-cbcoptic.doc-2017.tar.xz mirror://gentoo/texlive-module-ccaption.doc-2017.tar.xz mirror://gentoo/texlive-module-cclicenses.doc-2017.tar.xz mirror://gentoo/texlive-module-cd.doc-2017.tar.xz mirror://gentoo/texlive-module-cd-cover.doc-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl.doc-2017.tar.xz mirror://gentoo/texlive-module-cellspace.doc-2017.tar.xz mirror://gentoo/texlive-module-censor.doc-2017.tar.xz mirror://gentoo/texlive-module-changebar.doc-2017.tar.xz mirror://gentoo/texlive-module-changelayout.doc-2017.tar.xz mirror://gentoo/texlive-module-changepage.doc-2017.tar.xz mirror://gentoo/texlive-module-changes.doc-2017.tar.xz mirror://gentoo/texlive-module-chappg.doc-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder.doc-2017.tar.xz mirror://gentoo/texlive-module-chet.doc-2017.tar.xz mirror://gentoo/texlive-module-chextras.doc-2017.tar.xz mirror://gentoo/texlive-module-childdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-chkfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-chletter.doc-2017.tar.xz mirror://gentoo/texlive-module-chngcntr.doc-2017.tar.xz mirror://gentoo/texlive-module-chronology.doc-2017.tar.xz mirror://gentoo/texlive-module-circ.doc-2017.tar.xz mirror://gentoo/texlive-module-classics.doc-2017.tar.xz mirror://gentoo/texlive-module-classpack.doc-2017.tar.xz mirror://gentoo/texlive-module-clefval.doc-2017.tar.xz mirror://gentoo/texlive-module-cleveref.doc-2017.tar.xz mirror://gentoo/texlive-module-clipboard.doc-2017.tar.xz mirror://gentoo/texlive-module-clock.doc-2017.tar.xz mirror://gentoo/texlive-module-cmdstring.doc-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack.doc-2017.tar.xz mirror://gentoo/texlive-module-cmsd.doc-2017.tar.xz mirror://gentoo/texlive-module-cnltx.doc-2017.tar.xz mirror://gentoo/texlive-module-cntformats.doc-2017.tar.xz mirror://gentoo/texlive-module-cntperchap.doc-2017.tar.xz mirror://gentoo/texlive-module-codedoc.doc-2017.tar.xz mirror://gentoo/texlive-module-codepage.doc-2017.tar.xz mirror://gentoo/texlive-module-codesection.doc-2017.tar.xz mirror://gentoo/texlive-module-collcell.doc-2017.tar.xz mirror://gentoo/texlive-module-collectbox.doc-2017.tar.xz mirror://gentoo/texlive-module-colordoc.doc-2017.tar.xz mirror://gentoo/texlive-module-colorinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-coloring.doc-2017.tar.xz mirror://gentoo/texlive-module-colorspace.doc-2017.tar.xz mirror://gentoo/texlive-module-colortab.doc-2017.tar.xz mirror://gentoo/texlive-module-colorwav.doc-2017.tar.xz mirror://gentoo/texlive-module-colorweb.doc-2017.tar.xz mirror://gentoo/texlive-module-colourchange.doc-2017.tar.xz mirror://gentoo/texlive-module-combelow.doc-2017.tar.xz mirror://gentoo/texlive-module-combine.doc-2017.tar.xz mirror://gentoo/texlive-module-comma.doc-2017.tar.xz mirror://gentoo/texlive-module-commado.doc-2017.tar.xz mirror://gentoo/texlive-module-comment.doc-2017.tar.xz mirror://gentoo/texlive-module-concepts.doc-2017.tar.xz mirror://gentoo/texlive-module-concprog.doc-2017.tar.xz mirror://gentoo/texlive-module-constants.doc-2017.tar.xz mirror://gentoo/texlive-module-continue.doc-2017.tar.xz mirror://gentoo/texlive-module-contour.doc-2017.tar.xz mirror://gentoo/texlive-module-contracard.doc-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv.doc-2017.tar.xz mirror://gentoo/texlive-module-cooking.doc-2017.tar.xz mirror://gentoo/texlive-module-cooking-units.doc-2017.tar.xz mirror://gentoo/texlive-module-cool.doc-2017.tar.xz mirror://gentoo/texlive-module-coollist.doc-2017.tar.xz mirror://gentoo/texlive-module-coolstr.doc-2017.tar.xz mirror://gentoo/texlive-module-coolthms.doc-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips.doc-2017.tar.xz mirror://gentoo/texlive-module-coordsys.doc-2017.tar.xz mirror://gentoo/texlive-module-copyedit.doc-2017.tar.xz mirror://gentoo/texlive-module-copyrightbox.doc-2017.tar.xz mirror://gentoo/texlive-module-coseoul.doc-2017.tar.xz mirror://gentoo/texlive-module-counttexruns.doc-2017.tar.xz mirror://gentoo/texlive-module-courseoutline.doc-2017.tar.xz mirror://gentoo/texlive-module-coursepaper.doc-2017.tar.xz mirror://gentoo/texlive-module-coverpage.doc-2017.tar.xz mirror://gentoo/texlive-module-cprotect.doc-2017.tar.xz mirror://gentoo/texlive-module-crbox.doc-2017.tar.xz mirror://gentoo/texlive-module-crossreference.doc-2017.tar.xz mirror://gentoo/texlive-module-csquotes.doc-2017.tar.xz mirror://gentoo/texlive-module-css-colors.doc-2017.tar.xz mirror://gentoo/texlive-module-csvsimple.doc-2017.tar.xz mirror://gentoo/texlive-module-cuisine.doc-2017.tar.xz mirror://gentoo/texlive-module-currfile.doc-2017.tar.xz mirror://gentoo/texlive-module-cutwin.doc-2017.tar.xz mirror://gentoo/texlive-module-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-cv4tw.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-cyber.doc-2017.tar.xz mirror://gentoo/texlive-module-cybercic.doc-2017.tar.xz mirror://gentoo/texlive-module-dashbox.doc-2017.tar.xz mirror://gentoo/texlive-module-dashrule.doc-2017.tar.xz mirror://gentoo/texlive-module-dashundergaps.doc-2017.tar.xz mirror://gentoo/texlive-module-dataref.doc-2017.tar.xz mirror://gentoo/texlive-module-datatool.doc-2017.tar.xz mirror://gentoo/texlive-module-dateiliste.doc-2017.tar.xz mirror://gentoo/texlive-module-datenumber.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.doc-2017.tar.xz mirror://gentoo/texlive-module-dblfloatfix.doc-2017.tar.xz mirror://gentoo/texlive-module-decimal.doc-2017.tar.xz mirror://gentoo/texlive-module-decorule.doc-2017.tar.xz mirror://gentoo/texlive-module-delimtxt.doc-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-diagbox.doc-2017.tar.xz mirror://gentoo/texlive-module-diagnose.doc-2017.tar.xz mirror://gentoo/texlive-module-dialogl.doc-2017.tar.xz mirror://gentoo/texlive-module-dichokey.doc-2017.tar.xz mirror://gentoo/texlive-module-dinbrief.doc-2017.tar.xz mirror://gentoo/texlive-module-directory.doc-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk.doc-2017.tar.xz mirror://gentoo/texlive-module-dlfltxb.doc-2017.tar.xz mirror://gentoo/texlive-module-dnaseq.doc-2017.tar.xz mirror://gentoo/texlive-module-doclicense.doc-2017.tar.xz mirror://gentoo/texlive-module-docmfp.doc-2017.tar.xz mirror://gentoo/texlive-module-docmute.doc-2017.tar.xz mirror://gentoo/texlive-module-doctools.doc-2017.tar.xz mirror://gentoo/texlive-module-documentation.doc-2017.tar.xz mirror://gentoo/texlive-module-doi.doc-2017.tar.xz mirror://gentoo/texlive-module-dotarrow.doc-2017.tar.xz mirror://gentoo/texlive-module-dotseqn.doc-2017.tar.xz mirror://gentoo/texlive-module-download.doc-2017.tar.xz mirror://gentoo/texlive-module-dox.doc-2017.tar.xz mirror://gentoo/texlive-module-dpfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-dprogress.doc-2017.tar.xz mirror://gentoo/texlive-module-drac.doc-2017.tar.xz mirror://gentoo/texlive-module-draftcopy.doc-2017.tar.xz mirror://gentoo/texlive-module-draftfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-dtk.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery.doc-2017.tar.xz mirror://gentoo/texlive-module-dvdcoll.doc-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber.doc-2017.tar.xz mirror://gentoo/texlive-module-dynblocks.doc-2017.tar.xz mirror://gentoo/texlive-module-ean13isbn.doc-2017.tar.xz mirror://gentoo/texlive-module-easy.doc-2017.tar.xz mirror://gentoo/texlive-module-easy-todo.doc-2017.tar.xz mirror://gentoo/texlive-module-easyfig.doc-2017.tar.xz mirror://gentoo/texlive-module-easyformat.doc-2017.tar.xz mirror://gentoo/texlive-module-easylist.doc-2017.tar.xz mirror://gentoo/texlive-module-easyreview.doc-2017.tar.xz mirror://gentoo/texlive-module-ebezier.doc-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic.doc-2017.tar.xz mirror://gentoo/texlive-module-ecv.doc-2017.tar.xz mirror://gentoo/texlive-module-ed.doc-2017.tar.xz mirror://gentoo/texlive-module-edmargin.doc-2017.tar.xz mirror://gentoo/texlive-module-eemeir.doc-2017.tar.xz mirror://gentoo/texlive-module-efbox.doc-2017.tar.xz mirror://gentoo/texlive-module-egplot.doc-2017.tar.xz mirror://gentoo/texlive-module-elements.doc-2017.tar.xz mirror://gentoo/texlive-module-ellipsis.doc-2017.tar.xz mirror://gentoo/texlive-module-elmath.doc-2017.tar.xz mirror://gentoo/texlive-module-elocalloc.doc-2017.tar.xz mirror://gentoo/texlive-module-elpres.doc-2017.tar.xz mirror://gentoo/texlive-module-elzcards.doc-2017.tar.xz mirror://gentoo/texlive-module-emarks.doc-2017.tar.xz mirror://gentoo/texlive-module-embedall.doc-2017.tar.xz mirror://gentoo/texlive-module-embrac.doc-2017.tar.xz mirror://gentoo/texlive-module-emptypage.doc-2017.tar.xz mirror://gentoo/texlive-module-emulateapj.doc-2017.tar.xz mirror://gentoo/texlive-module-endfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-endheads.doc-2017.tar.xz mirror://gentoo/texlive-module-endnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-engpron.doc-2017.tar.xz mirror://gentoo/texlive-module-engrec.doc-2017.tar.xz mirror://gentoo/texlive-module-enotez.doc-2017.tar.xz mirror://gentoo/texlive-module-enumitem.doc-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref.doc-2017.tar.xz mirror://gentoo/texlive-module-envbig.doc-2017.tar.xz mirror://gentoo/texlive-module-environ.doc-2017.tar.xz mirror://gentoo/texlive-module-epigraph.doc-2017.tar.xz mirror://gentoo/texlive-module-epiolmec.doc-2017.tar.xz mirror://gentoo/texlive-module-eqell.doc-2017.tar.xz mirror://gentoo/texlive-module-eqlist.doc-2017.tar.xz mirror://gentoo/texlive-module-eqnalign.doc-2017.tar.xz mirror://gentoo/texlive-module-eqparbox.doc-2017.tar.xz mirror://gentoo/texlive-module-errata.doc-2017.tar.xz mirror://gentoo/texlive-module-esami.doc-2017.tar.xz mirror://gentoo/texlive-module-esdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-esint.doc-2017.tar.xz mirror://gentoo/texlive-module-esint-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-etaremune.doc-2017.tar.xz mirror://gentoo/texlive-module-etextools.doc-2017.tar.xz mirror://gentoo/texlive-module-etoc.doc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox.doc-2017.tar.xz mirror://gentoo/texlive-module-eukdate.doc-2017.tar.xz mirror://gentoo/texlive-module-eulerpx.doc-2017.tar.xz mirror://gentoo/texlive-module-europasscv.doc-2017.tar.xz mirror://gentoo/texlive-module-everyhook.doc-2017.tar.xz mirror://gentoo/texlive-module-everypage.doc-2017.tar.xz mirror://gentoo/texlive-module-exam.doc-2017.tar.xz mirror://gentoo/texlive-module-exam-n.doc-2017.tar.xz mirror://gentoo/texlive-module-examdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-examplep.doc-2017.tar.xz mirror://gentoo/texlive-module-exceltex.doc-2017.tar.xz mirror://gentoo/texlive-module-excludeonly.doc-2017.tar.xz mirror://gentoo/texlive-module-exercise.doc-2017.tar.xz mirror://gentoo/texlive-module-exercises.doc-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt.doc-2017.tar.xz mirror://gentoo/texlive-module-expdlist.doc-2017.tar.xz mirror://gentoo/texlive-module-export.doc-2017.tar.xz mirror://gentoo/texlive-module-exsheets.doc-2017.tar.xz mirror://gentoo/texlive-module-exsol.doc-2017.tar.xz mirror://gentoo/texlive-module-extract.doc-2017.tar.xz mirror://gentoo/texlive-module-facsimile.doc-2017.tar.xz mirror://gentoo/texlive-module-factura.doc-2017.tar.xz mirror://gentoo/texlive-module-fancylabel.doc-2017.tar.xz mirror://gentoo/texlive-module-fancynum.doc-2017.tar.xz mirror://gentoo/texlive-module-fancypar.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyslides.doc-2017.tar.xz mirror://gentoo/texlive-module-fancytabs.doc-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips.doc-2017.tar.xz mirror://gentoo/texlive-module-fcolumn.doc-2017.tar.xz mirror://gentoo/texlive-module-ffslides.doc-2017.tar.xz mirror://gentoo/texlive-module-fgruler.doc-2017.tar.xz mirror://gentoo/texlive-module-fibeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack.doc-2017.tar.xz mirror://gentoo/texlive-module-figsize.doc-2017.tar.xz mirror://gentoo/texlive-module-filecontents.doc-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef.doc-2017.tar.xz mirror://gentoo/texlive-module-filedate.doc-2017.tar.xz mirror://gentoo/texlive-module-fileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-filemod.doc-2017.tar.xz mirror://gentoo/texlive-module-fink.doc-2017.tar.xz mirror://gentoo/texlive-module-finstrut.doc-2017.tar.xz mirror://gentoo/texlive-module-fithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-fixcmex.doc-2017.tar.xz mirror://gentoo/texlive-module-fixfoot.doc-2017.tar.xz mirror://gentoo/texlive-module-fixme.doc-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-fjodor.doc-2017.tar.xz mirror://gentoo/texlive-module-flabels.doc-2017.tar.xz mirror://gentoo/texlive-module-flacards.doc-2017.tar.xz mirror://gentoo/texlive-module-flagderiv.doc-2017.tar.xz mirror://gentoo/texlive-module-flashcards.doc-2017.tar.xz mirror://gentoo/texlive-module-flashmovie.doc-2017.tar.xz mirror://gentoo/texlive-module-flipbook.doc-2017.tar.xz mirror://gentoo/texlive-module-flippdf.doc-2017.tar.xz mirror://gentoo/texlive-module-floatflt.doc-2017.tar.xz mirror://gentoo/texlive-module-floatrow.doc-2017.tar.xz mirror://gentoo/texlive-module-flowfram.doc-2017.tar.xz mirror://gentoo/texlive-module-fmp.doc-2017.tar.xz mirror://gentoo/texlive-module-fmtcount.doc-2017.tar.xz mirror://gentoo/texlive-module-fn2end.doc-2017.tar.xz mirror://gentoo/texlive-module-fnbreak.doc-2017.tar.xz mirror://gentoo/texlive-module-fncychap.doc-2017.tar.xz mirror://gentoo/texlive-module-fncylab.doc-2017.tar.xz mirror://gentoo/texlive-module-fnpara.doc-2017.tar.xz mirror://gentoo/texlive-module-fnpct.doc-2017.tar.xz mirror://gentoo/texlive-module-fnumprint.doc-2017.tar.xz mirror://gentoo/texlive-module-foilhtml.doc-2017.tar.xz mirror://gentoo/texlive-module-fontaxes.doc-2017.tar.xz mirror://gentoo/texlive-module-fonttable.doc-2017.tar.xz mirror://gentoo/texlive-module-footmisc.doc-2017.tar.xz mirror://gentoo/texlive-module-footmisx.doc-2017.tar.xz mirror://gentoo/texlive-module-footnotebackref.doc-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper.doc-2017.tar.xz mirror://gentoo/texlive-module-footnoterange.doc-2017.tar.xz mirror://gentoo/texlive-module-footnpag.doc-2017.tar.xz mirror://gentoo/texlive-module-forarray.doc-2017.tar.xz mirror://gentoo/texlive-module-foreign.doc-2017.tar.xz mirror://gentoo/texlive-module-forloop.doc-2017.tar.xz mirror://gentoo/texlive-module-formlett.doc-2017.tar.xz mirror://gentoo/texlive-module-formular.doc-2017.tar.xz mirror://gentoo/texlive-module-fragments.doc-2017.tar.xz mirror://gentoo/texlive-module-frame.doc-2017.tar.xz mirror://gentoo/texlive-module-framed.doc-2017.tar.xz mirror://gentoo/texlive-module-frankenstein.doc-2017.tar.xz mirror://gentoo/texlive-module-frege.doc-2017.tar.xz mirror://gentoo/texlive-module-ftcap.doc-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra.doc-2017.tar.xz mirror://gentoo/texlive-module-fullblck.doc-2017.tar.xz mirror://gentoo/texlive-module-fullminipage.doc-2017.tar.xz mirror://gentoo/texlive-module-fullwidth.doc-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra.doc-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.doc-2017.tar.xz mirror://gentoo/texlive-module-fvextra.doc-2017.tar.xz mirror://gentoo/texlive-module-fwlw.doc-2017.tar.xz mirror://gentoo/texlive-module-gauss.doc-2017.tar.xz mirror://gentoo/texlive-module-gcard.doc-2017.tar.xz mirror://gentoo/texlive-module-gcite.doc-2017.tar.xz mirror://gentoo/texlive-module-gender.doc-2017.tar.xz mirror://gentoo/texlive-module-genmpage.doc-2017.tar.xz mirror://gentoo/texlive-module-getfiledate.doc-2017.tar.xz mirror://gentoo/texlive-module-getitems.doc-2017.tar.xz mirror://gentoo/texlive-module-ginpenc.doc-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info.doc-2017.tar.xz mirror://gentoo/texlive-module-gitinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-gitinfo2.doc-2017.tar.xz mirror://gentoo/texlive-module-gitlog.doc-2017.tar.xz mirror://gentoo/texlive-module-gloss.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.doc-2017.tar.xz mirror://gentoo/texlive-module-gmiflink.doc-2017.tar.xz mirror://gentoo/texlive-module-gmutils.doc-2017.tar.xz mirror://gentoo/texlive-module-gmverb.doc-2017.tar.xz mirror://gentoo/texlive-module-graphbox.doc-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.doc-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox.doc-2017.tar.xz mirror://gentoo/texlive-module-grayhints.doc-2017.tar.xz mirror://gentoo/texlive-module-grfpaste.doc-2017.tar.xz mirror://gentoo/texlive-module-grid.doc-2017.tar.xz mirror://gentoo/texlive-module-grid-system.doc-2017.tar.xz mirror://gentoo/texlive-module-gridset.doc-2017.tar.xz mirror://gentoo/texlive-module-guitlogo.doc-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath.doc-2017.tar.xz mirror://gentoo/texlive-module-handout.doc-2017.tar.xz mirror://gentoo/texlive-module-hang.doc-2017.tar.xz mirror://gentoo/texlive-module-hanging.doc-2017.tar.xz mirror://gentoo/texlive-module-hardwrap.doc-2017.tar.xz mirror://gentoo/texlive-module-harnon-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-harpoon.doc-2017.tar.xz mirror://gentoo/texlive-module-hc.doc-2017.tar.xz mirror://gentoo/texlive-module-he-she.doc-2017.tar.xz mirror://gentoo/texlive-module-hhtensor.doc-2017.tar.xz mirror://gentoo/texlive-module-histogr.doc-2017.tar.xz mirror://gentoo/texlive-module-hitec.doc-2017.tar.xz mirror://gentoo/texlive-module-hletter.doc-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss.doc-2017.tar.xz mirror://gentoo/texlive-module-hrefhide.doc-2017.tar.xz mirror://gentoo/texlive-module-hvindex.doc-2017.tar.xz mirror://gentoo/texlive-module-hypdvips.doc-2017.tar.xz mirror://gentoo/texlive-module-hyper.doc-2017.tar.xz mirror://gentoo/texlive-module-hypernat.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperref-docsrc.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphenat.doc-2017.tar.xz mirror://gentoo/texlive-module-idxcmds.doc-2017.tar.xz mirror://gentoo/texlive-module-idxlayout.doc-2017.tar.xz mirror://gentoo/texlive-module-iffont.doc-2017.tar.xz mirror://gentoo/texlive-module-ifmslide.doc-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg.doc-2017.tar.xz mirror://gentoo/texlive-module-ifnextok.doc-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage.doc-2017.tar.xz mirror://gentoo/texlive-module-ifplatform.doc-2017.tar.xz mirror://gentoo/texlive-module-ifthenx.doc-2017.tar.xz mirror://gentoo/texlive-module-iitem.doc-2017.tar.xz mirror://gentoo/texlive-module-image-gallery.doc-2017.tar.xz mirror://gentoo/texlive-module-imakeidx.doc-2017.tar.xz mirror://gentoo/texlive-module-import.doc-2017.tar.xz mirror://gentoo/texlive-module-incgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-indextools.doc-2017.tar.xz mirror://gentoo/texlive-module-inlinedef.doc-2017.tar.xz mirror://gentoo/texlive-module-inputtrc.doc-2017.tar.xz mirror://gentoo/texlive-module-interactiveworkbook.doc-2017.tar.xz mirror://gentoo/texlive-module-interfaces.doc-2017.tar.xz mirror://gentoo/texlive-module-inversepath.doc-2017.tar.xz mirror://gentoo/texlive-module-invoice.doc-2017.tar.xz mirror://gentoo/texlive-module-iso.doc-2017.tar.xz mirror://gentoo/texlive-module-iso10303.doc-2017.tar.xz mirror://gentoo/texlive-module-isodate.doc-2017.tar.xz mirror://gentoo/texlive-module-isodoc.doc-2017.tar.xz mirror://gentoo/texlive-module-isonums.doc-2017.tar.xz mirror://gentoo/texlive-module-isorot.doc-2017.tar.xz mirror://gentoo/texlive-module-isotope.doc-2017.tar.xz mirror://gentoo/texlive-module-issuulinks.doc-2017.tar.xz mirror://gentoo/texlive-module-iwhdp.doc-2017.tar.xz mirror://gentoo/texlive-module-jlabels.doc-2017.tar.xz mirror://gentoo/texlive-module-jslectureplanner.doc-2017.tar.xz mirror://gentoo/texlive-module-jumplines.doc-2017.tar.xz mirror://gentoo/texlive-module-jvlisting.doc-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-kerntest.doc-2017.tar.xz mirror://gentoo/texlive-module-keycommand.doc-2017.tar.xz mirror://gentoo/texlive-module-keyfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-keyreader.doc-2017.tar.xz mirror://gentoo/texlive-module-keystroke.doc-2017.tar.xz mirror://gentoo/texlive-module-keyval2e.doc-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable.doc-2017.tar.xz mirror://gentoo/texlive-module-kix.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-script-sfs.doc-2017.tar.xz mirror://gentoo/texlive-module-komacv.doc-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata.doc-2017.tar.xz mirror://gentoo/texlive-module-l3build.doc-2017.tar.xz mirror://gentoo/texlive-module-labbook.doc-2017.tar.xz mirror://gentoo/texlive-module-labels.doc-2017.tar.xz mirror://gentoo/texlive-module-lastpackage.doc-2017.tar.xz mirror://gentoo/texlive-module-lastpage.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-tds.doc-2017.tar.xz mirror://gentoo/texlive-module-latexdemo.doc-2017.tar.xz mirror://gentoo/texlive-module-latexgit.doc-2017.tar.xz mirror://gentoo/texlive-module-layouts.doc-2017.tar.xz mirror://gentoo/texlive-module-lazylist.doc-2017.tar.xz mirror://gentoo/texlive-module-lcd.doc-2017.tar.xz mirror://gentoo/texlive-module-lcg.doc-2017.tar.xz mirror://gentoo/texlive-module-leading.doc-2017.tar.xz mirror://gentoo/texlive-module-leftidx.doc-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert.doc-2017.tar.xz mirror://gentoo/texlive-module-lettre.doc-2017.tar.xz mirror://gentoo/texlive-module-lettrine.doc-2017.tar.xz mirror://gentoo/texlive-module-lewis.doc-2017.tar.xz mirror://gentoo/texlive-module-lhelp.doc-2017.tar.xz mirror://gentoo/texlive-module-libgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-limap.doc-2017.tar.xz mirror://gentoo/texlive-module-linegoal.doc-2017.tar.xz mirror://gentoo/texlive-module-linop.doc-2017.tar.xz mirror://gentoo/texlive-module-lipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-lisp-on-tex.doc-2017.tar.xz mirror://gentoo/texlive-module-listing.doc-2017.tar.xz mirror://gentoo/texlive-module-listlbls.doc-2017.tar.xz mirror://gentoo/texlive-module-listliketab.doc-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-lkproof.doc-2017.tar.xz mirror://gentoo/texlive-module-lmake.doc-2017.tar.xz mirror://gentoo/texlive-module-locality.doc-2017.tar.xz mirror://gentoo/texlive-module-localloc.doc-2017.tar.xz mirror://gentoo/texlive-module-logbox.doc-2017.tar.xz mirror://gentoo/texlive-module-logical-markup-utils.doc-2017.tar.xz mirror://gentoo/texlive-module-logpap.doc-2017.tar.xz mirror://gentoo/texlive-module-longfbox.doc-2017.tar.xz mirror://gentoo/texlive-module-longfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-loops.doc-2017.tar.xz mirror://gentoo/texlive-module-lsc.doc-2017.tar.xz mirror://gentoo/texlive-module-lstaddons.doc-2017.tar.xz mirror://gentoo/texlive-module-lt3graph.doc-2017.tar.xz mirror://gentoo/texlive-module-ltablex.doc-2017.tar.xz mirror://gentoo/texlive-module-ltabptch.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxdockit.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxindex.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxkeys.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxnew.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxtools.doc-2017.tar.xz mirror://gentoo/texlive-module-macroswap.doc-2017.tar.xz mirror://gentoo/texlive-module-magaz.doc-2017.tar.xz mirror://gentoo/texlive-module-mailing.doc-2017.tar.xz mirror://gentoo/texlive-module-mailmerge.doc-2017.tar.xz mirror://gentoo/texlive-module-makebarcode.doc-2017.tar.xz mirror://gentoo/texlive-module-makebase.doc-2017.tar.xz mirror://gentoo/texlive-module-makebox.doc-2017.tar.xz mirror://gentoo/texlive-module-makecell.doc-2017.tar.xz mirror://gentoo/texlive-module-makecirc.doc-2017.tar.xz mirror://gentoo/texlive-module-makecmds.doc-2017.tar.xz mirror://gentoo/texlive-module-makedtx.doc-2017.tar.xz mirror://gentoo/texlive-module-makeglos.doc-2017.tar.xz mirror://gentoo/texlive-module-mandi.doc-2017.tar.xz mirror://gentoo/texlive-module-manuscript.doc-2017.tar.xz mirror://gentoo/texlive-module-marginfix.doc-2017.tar.xz mirror://gentoo/texlive-module-marginnote.doc-2017.tar.xz mirror://gentoo/texlive-module-markdown.doc-2017.tar.xz mirror://gentoo/texlive-module-mathalfa.doc-2017.tar.xz mirror://gentoo/texlive-module-mathastext.doc-2017.tar.xz mirror://gentoo/texlive-module-mathexam.doc-2017.tar.xz mirror://gentoo/texlive-module-maybemath.doc-2017.tar.xz mirror://gentoo/texlive-module-mbenotes.doc-2017.tar.xz mirror://gentoo/texlive-module-mcaption.doc-2017.tar.xz mirror://gentoo/texlive-module-mceinleger.doc-2017.tar.xz mirror://gentoo/texlive-module-mcexam.doc-2017.tar.xz mirror://gentoo/texlive-module-mcite.doc-2017.tar.xz mirror://gentoo/texlive-module-mciteplus.doc-2017.tar.xz mirror://gentoo/texlive-module-mdframed.doc-2017.tar.xz mirror://gentoo/texlive-module-media9.doc-2017.tar.xz mirror://gentoo/texlive-module-medstarbeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-meetingmins.doc-2017.tar.xz mirror://gentoo/texlive-module-memexsupp.doc-2017.tar.xz mirror://gentoo/texlive-module-memory.doc-2017.tar.xz mirror://gentoo/texlive-module-menu.doc-2017.tar.xz mirror://gentoo/texlive-module-menukeys.doc-2017.tar.xz mirror://gentoo/texlive-module-method.doc-2017.tar.xz mirror://gentoo/texlive-module-metre.doc-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc.doc-2017.tar.xz mirror://gentoo/texlive-module-mftinc.doc-2017.tar.xz mirror://gentoo/texlive-module-midpage.doc-2017.tar.xz mirror://gentoo/texlive-module-minibox.doc-2017.tar.xz mirror://gentoo/texlive-module-minidocument.doc-2017.tar.xz mirror://gentoo/texlive-module-minifp.doc-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.doc-2017.tar.xz mirror://gentoo/texlive-module-minitoc.doc-2017.tar.xz mirror://gentoo/texlive-module-minorrevision.doc-2017.tar.xz mirror://gentoo/texlive-module-minted.doc-2017.tar.xz mirror://gentoo/texlive-module-minutes.doc-2017.tar.xz mirror://gentoo/texlive-module-mla-paper.doc-2017.tar.xz mirror://gentoo/texlive-module-mlist.doc-2017.tar.xz mirror://gentoo/texlive-module-mmap.doc-2017.tar.xz mirror://gentoo/texlive-module-mnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-moderncv.doc-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline.doc-2017.tar.xz mirror://gentoo/texlive-module-modref.doc-2017.tar.xz mirror://gentoo/texlive-module-modroman.doc-2017.tar.xz mirror://gentoo/texlive-module-modular.doc-2017.tar.xz mirror://gentoo/texlive-module-monofill.doc-2017.tar.xz mirror://gentoo/texlive-module-moodle.doc-2017.tar.xz mirror://gentoo/texlive-module-moreenum.doc-2017.tar.xz mirror://gentoo/texlive-module-morefloats.doc-2017.tar.xz mirror://gentoo/texlive-module-morehype.doc-2017.tar.xz mirror://gentoo/texlive-module-moresize.doc-2017.tar.xz mirror://gentoo/texlive-module-moreverb.doc-2017.tar.xz mirror://gentoo/texlive-module-morewrites.doc-2017.tar.xz mirror://gentoo/texlive-module-movie15.doc-2017.tar.xz mirror://gentoo/texlive-module-mparhack.doc-2017.tar.xz mirror://gentoo/texlive-module-mpostinl.doc-2017.tar.xz mirror://gentoo/texlive-module-msc.doc-2017.tar.xz mirror://gentoo/texlive-module-msg.doc-2017.tar.xz mirror://gentoo/texlive-module-mslapa.doc-2017.tar.xz mirror://gentoo/texlive-module-mtgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-multenum.doc-2017.tar.xz mirror://gentoo/texlive-module-multiaudience.doc-2017.tar.xz mirror://gentoo/texlive-module-multibbl.doc-2017.tar.xz mirror://gentoo/texlive-module-multicap.doc-2017.tar.xz mirror://gentoo/texlive-module-multidef.doc-2017.tar.xz mirror://gentoo/texlive-module-multienv.doc-2017.tar.xz mirror://gentoo/texlive-module-multiexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-multirow.doc-2017.tar.xz mirror://gentoo/texlive-module-mversion.doc-2017.tar.xz mirror://gentoo/texlive-module-mwe.doc-2017.tar.xz mirror://gentoo/texlive-module-mycv.doc-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat.doc-2017.tar.xz mirror://gentoo/texlive-module-nag.doc-2017.tar.xz mirror://gentoo/texlive-module-nameauth.doc-2017.tar.xz mirror://gentoo/texlive-module-namespc.doc-2017.tar.xz mirror://gentoo/texlive-module-ncclatex.doc-2017.tar.xz mirror://gentoo/texlive-module-ncctools.doc-2017.tar.xz mirror://gentoo/texlive-module-needspace.doc-2017.tar.xz mirror://gentoo/texlive-module-newcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-newenviron.doc-2017.tar.xz mirror://gentoo/texlive-module-newfile.doc-2017.tar.xz mirror://gentoo/texlive-module-newlfm.doc-2017.tar.xz mirror://gentoo/texlive-module-newspaper.doc-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar.doc-2017.tar.xz mirror://gentoo/texlive-module-newvbtm.doc-2017.tar.xz mirror://gentoo/texlive-module-newverbs.doc-2017.tar.xz mirror://gentoo/texlive-module-nfssext-cfr.doc-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-niceframe.doc-2017.tar.xz mirror://gentoo/texlive-module-nicetext.doc-2017.tar.xz mirror://gentoo/texlive-module-nlctdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-noconflict.doc-2017.tar.xz mirror://gentoo/texlive-module-noindentafter.doc-2017.tar.xz mirror://gentoo/texlive-module-noitcrul.doc-2017.tar.xz mirror://gentoo/texlive-module-nolbreaks.doc-2017.tar.xz mirror://gentoo/texlive-module-nomencl.doc-2017.tar.xz mirror://gentoo/texlive-module-nomentbl.doc-2017.tar.xz mirror://gentoo/texlive-module-nonfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart.doc-2017.tar.xz mirror://gentoo/texlive-module-nopageno.doc-2017.tar.xz mirror://gentoo/texlive-module-normalcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-notes.doc-2017.tar.xz mirror://gentoo/texlive-module-notespages.doc-2017.tar.xz mirror://gentoo/texlive-module-notoccite.doc-2017.tar.xz mirror://gentoo/texlive-module-nowidow.doc-2017.tar.xz mirror://gentoo/texlive-module-nox.doc-2017.tar.xz mirror://gentoo/texlive-module-ntheorem.doc-2017.tar.xz mirror://gentoo/texlive-module-numberedblock.doc-2017.tar.xz mirror://gentoo/texlive-module-numname.doc-2017.tar.xz mirror://gentoo/texlive-module-numprint.doc-2017.tar.xz mirror://gentoo/texlive-module-numspell.doc-2017.tar.xz mirror://gentoo/texlive-module-ocg-p.doc-2017.tar.xz mirror://gentoo/texlive-module-ocgx.doc-2017.tar.xz mirror://gentoo/texlive-module-ocgx2.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-octavo.doc-2017.tar.xz mirror://gentoo/texlive-module-oldstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath.doc-2017.tar.xz mirror://gentoo/texlive-module-opcit.doc-2017.tar.xz mirror://gentoo/texlive-module-optidef.doc-2017.tar.xz mirror://gentoo/texlive-module-optional.doc-2017.tar.xz mirror://gentoo/texlive-module-options.doc-2017.tar.xz mirror://gentoo/texlive-module-outline.doc-2017.tar.xz mirror://gentoo/texlive-module-outliner.doc-2017.tar.xz mirror://gentoo/texlive-module-outlines.doc-2017.tar.xz mirror://gentoo/texlive-module-overlays.doc-2017.tar.xz mirror://gentoo/texlive-module-overpic.doc-2017.tar.xz mirror://gentoo/texlive-module-pagecolor.doc-2017.tar.xz mirror://gentoo/texlive-module-pagecont.doc-2017.tar.xz mirror://gentoo/texlive-module-pagenote.doc-2017.tar.xz mirror://gentoo/texlive-module-pagerange.doc-2017.tar.xz mirror://gentoo/texlive-module-pageslts.doc-2017.tar.xz mirror://gentoo/texlive-module-paper.doc-2017.tar.xz mirror://gentoo/texlive-module-papercdcase.doc-2017.tar.xz mirror://gentoo/texlive-module-papermas.doc-2017.tar.xz mirror://gentoo/texlive-module-papertex.doc-2017.tar.xz mirror://gentoo/texlive-module-paracol.doc-2017.tar.xz mirror://gentoo/texlive-module-parades.doc-2017.tar.xz mirror://gentoo/texlive-module-paralist.doc-2017.tar.xz mirror://gentoo/texlive-module-paresse.doc-2017.tar.xz mirror://gentoo/texlive-module-parnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-parselines.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-cours.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-tableur.doc-2017.tar.xz mirror://gentoo/texlive-module-patchcmd.doc-2017.tar.xz mirror://gentoo/texlive-module-pauldoc.doc-2017.tar.xz mirror://gentoo/texlive-module-pawpict.doc-2017.tar.xz mirror://gentoo/texlive-module-pbox.doc-2017.tar.xz mirror://gentoo/texlive-module-pbsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-pdf14.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcomment.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfmarginpar.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfpagediff.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfscreen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfslide.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfsync.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfwin.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfx.doc-2017.tar.xz mirror://gentoo/texlive-module-pecha.doc-2017.tar.xz mirror://gentoo/texlive-module-perltex.doc-2017.tar.xz mirror://gentoo/texlive-module-permute.doc-2017.tar.xz mirror://gentoo/texlive-module-petiteannonce.doc-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.doc-2017.tar.xz mirror://gentoo/texlive-module-phfnote.doc-2017.tar.xz mirror://gentoo/texlive-module-phfparen.doc-2017.tar.xz mirror://gentoo/texlive-module-phfqit.doc-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext.doc-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-phfthm.doc-2017.tar.xz mirror://gentoo/texlive-module-philex.doc-2017.tar.xz mirror://gentoo/texlive-module-phonenumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-photo.doc-2017.tar.xz mirror://gentoo/texlive-module-piff.doc-2017.tar.xz mirror://gentoo/texlive-module-pkgloader.doc-2017.tar.xz mirror://gentoo/texlive-module-placeins.doc-2017.tar.xz mirror://gentoo/texlive-module-plantslabels.doc-2017.tar.xz mirror://gentoo/texlive-module-plates.doc-2017.tar.xz mirror://gentoo/texlive-module-plweb.doc-2017.tar.xz mirror://gentoo/texlive-module-polynom.doc-2017.tar.xz mirror://gentoo/texlive-module-polynomial.doc-2017.tar.xz mirror://gentoo/texlive-module-polytable.doc-2017.tar.xz mirror://gentoo/texlive-module-postcards.doc-2017.tar.xz mirror://gentoo/texlive-module-poster-mac.doc-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv.doc-2017.tar.xz mirror://gentoo/texlive-module-preprint.doc-2017.tar.xz mirror://gentoo/texlive-module-pressrelease.doc-2017.tar.xz mirror://gentoo/texlive-module-prettyref.doc-2017.tar.xz mirror://gentoo/texlive-module-preview.doc-2017.tar.xz mirror://gentoo/texlive-module-printlen.doc-2017.tar.xz mirror://gentoo/texlive-module-probsoln.doc-2017.tar.xz mirror://gentoo/texlive-module-program.doc-2017.tar.xz mirror://gentoo/texlive-module-progress.doc-2017.tar.xz mirror://gentoo/texlive-module-progressbar.doc-2017.tar.xz mirror://gentoo/texlive-module-proofread.doc-2017.tar.xz mirror://gentoo/texlive-module-properties.doc-2017.tar.xz mirror://gentoo/texlive-module-prosper.doc-2017.tar.xz mirror://gentoo/texlive-module-protex.doc-2017.tar.xz mirror://gentoo/texlive-module-protocol.doc-2017.tar.xz mirror://gentoo/texlive-module-psfragx.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pstool.doc-2017.tar.xz mirror://gentoo/texlive-module-pstring.doc-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks.doc-2017.tar.xz mirror://gentoo/texlive-module-python.doc-2017.tar.xz mirror://gentoo/texlive-module-qcm.doc-2017.tar.xz mirror://gentoo/texlive-module-qstest.doc-2017.tar.xz mirror://gentoo/texlive-module-qsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-quicktype.doc-2017.tar.xz mirror://gentoo/texlive-module-quotchap.doc-2017.tar.xz mirror://gentoo/texlive-module-quoting.doc-2017.tar.xz mirror://gentoo/texlive-module-quotmark.doc-2017.tar.xz mirror://gentoo/texlive-module-ran_toks.doc-2017.tar.xz mirror://gentoo/texlive-module-randtext.doc-2017.tar.xz mirror://gentoo/texlive-module-rccol.doc-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi.doc-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-readarray.doc-2017.tar.xz mirror://gentoo/texlive-module-realboxes.doc-2017.tar.xz mirror://gentoo/texlive-module-recipe.doc-2017.tar.xz mirror://gentoo/texlive-module-recipebook.doc-2017.tar.xz mirror://gentoo/texlive-module-recipecard.doc-2017.tar.xz mirror://gentoo/texlive-module-rectopma.doc-2017.tar.xz mirror://gentoo/texlive-module-refcheck.doc-2017.tar.xz mirror://gentoo/texlive-module-refenums.doc-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-refman.doc-2017.tar.xz mirror://gentoo/texlive-module-refstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-regcount.doc-2017.tar.xz mirror://gentoo/texlive-module-regexpatch.doc-2017.tar.xz mirror://gentoo/texlive-module-register.doc-2017.tar.xz mirror://gentoo/texlive-module-regstats.doc-2017.tar.xz mirror://gentoo/texlive-module-relenc.doc-2017.tar.xz mirror://gentoo/texlive-module-relsize.doc-2017.tar.xz mirror://gentoo/texlive-module-repeatindex.doc-2017.tar.xz mirror://gentoo/texlive-module-repltext.doc-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap.doc-2017.tar.xz mirror://gentoo/texlive-module-rlepsf.doc-2017.tar.xz mirror://gentoo/texlive-module-rmpage.doc-2017.tar.xz mirror://gentoo/texlive-module-robustcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-robustindex.doc-2017.tar.xz mirror://gentoo/texlive-module-romanbar.doc-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.doc-2017.tar.xz mirror://gentoo/texlive-module-romanneg.doc-2017.tar.xz mirror://gentoo/texlive-module-romannum.doc-2017.tar.xz mirror://gentoo/texlive-module-rotfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-rotpages.doc-2017.tar.xz mirror://gentoo/texlive-module-roundbox.doc-2017.tar.xz mirror://gentoo/texlive-module-rterface.doc-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc.doc-2017.tar.xz mirror://gentoo/texlive-module-rulercompass.doc-2017.tar.xz mirror://gentoo/texlive-module-rvwrite.doc-2017.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut.doc-2017.tar.xz mirror://gentoo/texlive-module-sauerj.doc-2017.tar.xz mirror://gentoo/texlive-module-savefnmark.doc-2017.tar.xz mirror://gentoo/texlive-module-savetrees.doc-2017.tar.xz mirror://gentoo/texlive-module-scale.doc-2017.tar.xz mirror://gentoo/texlive-module-scalebar.doc-2017.tar.xz mirror://gentoo/texlive-module-scalerel.doc-2017.tar.xz mirror://gentoo/texlive-module-scanpages.doc-2017.tar.xz mirror://gentoo/texlive-module-scrlttr2copy.doc-2017.tar.xz mirror://gentoo/texlive-module-sdrt.doc-2017.tar.xz mirror://gentoo/texlive-module-secdot.doc-2017.tar.xz mirror://gentoo/texlive-module-sectionbox.doc-2017.tar.xz mirror://gentoo/texlive-module-sectsty.doc-2017.tar.xz mirror://gentoo/texlive-module-seealso.doc-2017.tar.xz mirror://gentoo/texlive-module-selectp.doc-2017.tar.xz mirror://gentoo/texlive-module-semantic.doc-2017.tar.xz mirror://gentoo/texlive-module-semantic-markup.doc-2017.tar.xz mirror://gentoo/texlive-module-semioneside.doc-2017.tar.xz mirror://gentoo/texlive-module-semproc.doc-2017.tar.xz mirror://gentoo/texlive-module-sepfootnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-seqsplit.doc-2017.tar.xz mirror://gentoo/texlive-module-sesstime.doc-2017.tar.xz mirror://gentoo/texlive-module-sf298.doc-2017.tar.xz mirror://gentoo/texlive-module-sffms.doc-2017.tar.xz mirror://gentoo/texlive-module-shadethm.doc-2017.tar.xz mirror://gentoo/texlive-module-shadow.doc-2017.tar.xz mirror://gentoo/texlive-module-shadowtext.doc-2017.tar.xz mirror://gentoo/texlive-module-shapepar.doc-2017.tar.xz mirror://gentoo/texlive-module-shdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-shipunov.doc-2017.tar.xz mirror://gentoo/texlive-module-shorttoc.doc-2017.tar.xz mirror://gentoo/texlive-module-show2e.doc-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox.doc-2017.tar.xz mirror://gentoo/texlive-module-showdim.doc-2017.tar.xz mirror://gentoo/texlive-module-showexpl.doc-2017.tar.xz mirror://gentoo/texlive-module-showlabels.doc-2017.tar.xz mirror://gentoo/texlive-module-sidecap.doc-2017.tar.xz mirror://gentoo/texlive-module-sidenotes.doc-2017.tar.xz mirror://gentoo/texlive-module-silence.doc-2017.tar.xz mirror://gentoo/texlive-module-simplecd.doc-2017.tar.xz mirror://gentoo/texlive-module-simplecv.doc-2017.tar.xz mirror://gentoo/texlive-module-sitem.doc-2017.tar.xz mirror://gentoo/texlive-module-skb.doc-2017.tar.xz mirror://gentoo/texlive-module-skdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-skeycommand.doc-2017.tar.xz mirror://gentoo/texlive-module-skeyval.doc-2017.tar.xz mirror://gentoo/texlive-module-skrapport.doc-2017.tar.xz mirror://gentoo/texlive-module-slantsc.doc-2017.tar.xz mirror://gentoo/texlive-module-smalltableof.doc-2017.tar.xz mirror://gentoo/texlive-module-smartunits.doc-2017.tar.xz mirror://gentoo/texlive-module-smartref.doc-2017.tar.xz mirror://gentoo/texlive-module-snapshot.doc-2017.tar.xz mirror://gentoo/texlive-module-snotez.doc-2017.tar.xz mirror://gentoo/texlive-module-soul.doc-2017.tar.xz mirror://gentoo/texlive-module-sparklines.doc-2017.tar.xz mirror://gentoo/texlive-module-sphack.doc-2017.tar.xz mirror://gentoo/texlive-module-splitindex.doc-2017.tar.xz mirror://gentoo/texlive-module-spot.doc-2017.tar.xz mirror://gentoo/texlive-module-spotcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-spreadtab.doc-2017.tar.xz mirror://gentoo/texlive-module-spverbatim.doc-2017.tar.xz mirror://gentoo/texlive-module-srbook-mem.doc-2017.tar.xz mirror://gentoo/texlive-module-srcltx.doc-2017.tar.xz mirror://gentoo/texlive-module-sseq.doc-2017.tar.xz mirror://gentoo/texlive-module-sslides.doc-2017.tar.xz mirror://gentoo/texlive-module-stackengine.doc-2017.tar.xz mirror://gentoo/texlive-module-standalone.doc-2017.tar.xz mirror://gentoo/texlive-module-statistik.doc-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv.doc-2017.tar.xz mirror://gentoo/texlive-module-stdpage.doc-2017.tar.xz mirror://gentoo/texlive-module-stex.doc-2017.tar.xz mirror://gentoo/texlive-module-storebox.doc-2017.tar.xz mirror://gentoo/texlive-module-storecmd.doc-2017.tar.xz mirror://gentoo/texlive-module-stringstrings.doc-2017.tar.xz mirror://gentoo/texlive-module-sttools.doc-2017.tar.xz mirror://gentoo/texlive-module-stubs.doc-2017.tar.xz mirror://gentoo/texlive-module-studenthandouts.doc-2017.tar.xz mirror://gentoo/texlive-module-subdepth.doc-2017.tar.xz mirror://gentoo/texlive-module-subeqn.doc-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray.doc-2017.tar.xz mirror://gentoo/texlive-module-subfigmat.doc-2017.tar.xz mirror://gentoo/texlive-module-subfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-subfiles.doc-2017.tar.xz mirror://gentoo/texlive-module-subfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-substitutefont.doc-2017.tar.xz mirror://gentoo/texlive-module-substr.doc-2017.tar.xz mirror://gentoo/texlive-module-supertabular.doc-2017.tar.xz mirror://gentoo/texlive-module-svg.doc-2017.tar.xz mirror://gentoo/texlive-module-svgcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-svn.doc-2017.tar.xz mirror://gentoo/texlive-module-svn-multi.doc-2017.tar.xz mirror://gentoo/texlive-module-svn-prov.doc-2017.tar.xz mirror://gentoo/texlive-module-syntax.doc-2017.tar.xz mirror://gentoo/texlive-module-syntrace.doc-2017.tar.xz mirror://gentoo/texlive-module-synttree.doc-2017.tar.xz mirror://gentoo/texlive-module-tabfigures.doc-2017.tar.xz mirror://gentoo/texlive-module-tableaux.doc-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote.doc-2017.tar.xz mirror://gentoo/texlive-module-tableof.doc-2017.tar.xz mirror://gentoo/texlive-module-tablestyles.doc-2017.tar.xz mirror://gentoo/texlive-module-tablists.doc-2017.tar.xz mirror://gentoo/texlive-module-tabls.doc-2017.tar.xz mirror://gentoo/texlive-module-tabstackengine.doc-2017.tar.xz mirror://gentoo/texlive-module-tabto-ltx.doc-2017.tar.xz mirror://gentoo/texlive-module-tabu.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularborder.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularcalc.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularew.doc-2017.tar.xz mirror://gentoo/texlive-module-tabulary.doc-2017.tar.xz mirror://gentoo/texlive-module-tagging.doc-2017.tar.xz mirror://gentoo/texlive-module-tagpair.doc-2017.tar.xz mirror://gentoo/texlive-module-talk.doc-2017.tar.xz mirror://gentoo/texlive-module-tamefloats.doc-2017.tar.xz mirror://gentoo/texlive-module-tasks.doc-2017.tar.xz mirror://gentoo/texlive-module-tcldoc.doc-2017.tar.xz mirror://gentoo/texlive-module-tcolorbox.doc-2017.tar.xz mirror://gentoo/texlive-module-tdclock.doc-2017.tar.xz mirror://gentoo/texlive-module-technics.doc-2017.tar.xz mirror://gentoo/texlive-module-ted.doc-2017.tar.xz mirror://gentoo/texlive-module-templatetools.doc-2017.tar.xz mirror://gentoo/texlive-module-termcal.doc-2017.tar.xz mirror://gentoo/texlive-module-termlist.doc-2017.tar.xz mirror://gentoo/texlive-module-testhyphens.doc-2017.tar.xz mirror://gentoo/texlive-module-testidx.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-label.doc-2017.tar.xz mirror://gentoo/texlive-module-texmate.doc-2017.tar.xz mirror://gentoo/texlive-module-texments.doc-2017.tar.xz mirror://gentoo/texlive-module-texpower.doc-2017.tar.xz mirror://gentoo/texlive-module-texshade.doc-2017.tar.xz mirror://gentoo/texlive-module-texvc.doc-2017.tar.xz mirror://gentoo/texlive-module-textfit.doc-2017.tar.xz mirror://gentoo/texlive-module-textmerg.doc-2017.tar.xz mirror://gentoo/texlive-module-textpos.doc-2017.tar.xz mirror://gentoo/texlive-module-theoremref.doc-2017.tar.xz mirror://gentoo/texlive-module-thinsp.doc-2017.tar.xz mirror://gentoo/texlive-module-thmtools.doc-2017.tar.xz mirror://gentoo/texlive-module-threadcol.doc-2017.tar.xz mirror://gentoo/texlive-module-threeparttable.doc-2017.tar.xz mirror://gentoo/texlive-module-threeparttablex.doc-2017.tar.xz mirror://gentoo/texlive-module-thumb.doc-2017.tar.xz mirror://gentoo/texlive-module-thumbs.doc-2017.tar.xz mirror://gentoo/texlive-module-thumby.doc-2017.tar.xz mirror://gentoo/texlive-module-ticket.doc-2017.tar.xz mirror://gentoo/texlive-module-titlecaps.doc-2017.tar.xz mirror://gentoo/texlive-module-titlepic.doc-2017.tar.xz mirror://gentoo/texlive-module-titleref.doc-2017.tar.xz mirror://gentoo/texlive-module-titlesec.doc-2017.tar.xz mirror://gentoo/texlive-module-titling.doc-2017.tar.xz mirror://gentoo/texlive-module-tocbibind.doc-2017.tar.xz mirror://gentoo/texlive-module-tocdata.doc-2017.tar.xz mirror://gentoo/texlive-module-tocloft.doc-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2.doc-2017.tar.xz mirror://gentoo/texlive-module-todo.doc-2017.tar.xz mirror://gentoo/texlive-module-todonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-tokenizer.doc-2017.tar.xz mirror://gentoo/texlive-module-toolbox.doc-2017.tar.xz mirror://gentoo/texlive-module-topfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-totcount.doc-2017.tar.xz mirror://gentoo/texlive-module-totpages.doc-2017.tar.xz mirror://gentoo/texlive-module-translations.doc-2017.tar.xz mirror://gentoo/texlive-module-trfsigns.doc-2017.tar.xz mirror://gentoo/texlive-module-trimspaces.doc-2017.tar.xz mirror://gentoo/texlive-module-trivfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-trsym.doc-2017.tar.xz mirror://gentoo/texlive-module-truncate.doc-2017.tar.xz mirror://gentoo/texlive-module-tucv.doc-2017.tar.xz mirror://gentoo/texlive-module-turnthepage.doc-2017.tar.xz mirror://gentoo/texlive-module-twoinone.doc-2017.tar.xz mirror://gentoo/texlive-module-twoup.doc-2017.tar.xz mirror://gentoo/texlive-module-txgreeks.doc-2017.tar.xz mirror://gentoo/texlive-module-type1cm.doc-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist.doc-2017.tar.xz mirror://gentoo/texlive-module-typeface.doc-2017.tar.xz mirror://gentoo/texlive-module-typoaid.doc-2017.tar.xz mirror://gentoo/texlive-module-typogrid.doc-2017.tar.xz mirror://gentoo/texlive-module-uassign.doc-2017.tar.xz mirror://gentoo/texlive-module-ucs.doc-2017.tar.xz mirror://gentoo/texlive-module-uebungsblatt.doc-2017.tar.xz mirror://gentoo/texlive-module-umoline.doc-2017.tar.xz mirror://gentoo/texlive-module-underlin.doc-2017.tar.xz mirror://gentoo/texlive-module-underoverlap.doc-2017.tar.xz mirror://gentoo/texlive-module-undolabl.doc-2017.tar.xz mirror://gentoo/texlive-module-units.doc-2017.tar.xz mirror://gentoo/texlive-module-unravel.doc-2017.tar.xz mirror://gentoo/texlive-module-upmethodology.doc-2017.tar.xz mirror://gentoo/texlive-module-upquote.doc-2017.tar.xz mirror://gentoo/texlive-module-uri.doc-2017.tar.xz mirror://gentoo/texlive-module-ushort.doc-2017.tar.xz mirror://gentoo/texlive-module-uspace.doc-2017.tar.xz mirror://gentoo/texlive-module-uwmslide.doc-2017.tar.xz mirror://gentoo/texlive-module-variablelm.doc-2017.tar.xz mirror://gentoo/texlive-module-varindex.doc-2017.tar.xz mirror://gentoo/texlive-module-varsfromjobname.doc-2017.tar.xz mirror://gentoo/texlive-module-varwidth.doc-2017.tar.xz mirror://gentoo/texlive-module-vdmlisting.doc-2017.tar.xz mirror://gentoo/texlive-module-verbasef.doc-2017.tar.xz mirror://gentoo/texlive-module-verbatimbox.doc-2017.tar.xz mirror://gentoo/texlive-module-verbatimcopy.doc-2017.tar.xz mirror://gentoo/texlive-module-verbdef.doc-2017.tar.xz mirror://gentoo/texlive-module-verbments.doc-2017.tar.xz mirror://gentoo/texlive-module-version.doc-2017.tar.xz mirror://gentoo/texlive-module-versions.doc-2017.tar.xz mirror://gentoo/texlive-module-versonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-vertbars.doc-2017.tar.xz mirror://gentoo/texlive-module-vgrid.doc-2017.tar.xz mirror://gentoo/texlive-module-vhistory.doc-2017.tar.xz mirror://gentoo/texlive-module-vmargin.doc-2017.tar.xz mirror://gentoo/texlive-module-volumes.doc-2017.tar.xz mirror://gentoo/texlive-module-vpe.doc-2017.tar.xz mirror://gentoo/texlive-module-vruler.doc-2017.tar.xz mirror://gentoo/texlive-module-vwcol.doc-2017.tar.xz mirror://gentoo/texlive-module-wallpaper.doc-2017.tar.xz mirror://gentoo/texlive-module-warning.doc-2017.tar.xz mirror://gentoo/texlive-module-warpcol.doc-2017.tar.xz mirror://gentoo/texlive-module-was.doc-2017.tar.xz mirror://gentoo/texlive-module-widetable.doc-2017.tar.xz mirror://gentoo/texlive-module-williams.doc-2017.tar.xz mirror://gentoo/texlive-module-withargs.doc-2017.tar.xz mirror://gentoo/texlive-module-wordcount.doc-2017.tar.xz mirror://gentoo/texlive-module-wordlike.doc-2017.tar.xz mirror://gentoo/texlive-module-wrapfig.doc-2017.tar.xz mirror://gentoo/texlive-module-wtref.doc-2017.tar.xz mirror://gentoo/texlive-module-xargs.doc-2017.tar.xz mirror://gentoo/texlive-module-xassoccnt.doc-2017.tar.xz mirror://gentoo/texlive-module-xcntperchap.doc-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material.doc-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.doc-2017.tar.xz mirror://gentoo/texlive-module-xcomment.doc-2017.tar.xz mirror://gentoo/texlive-module-xdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-xellipsis.doc-2017.tar.xz mirror://gentoo/texlive-module-xfor.doc-2017.tar.xz mirror://gentoo/texlive-module-xhfill.doc-2017.tar.xz mirror://gentoo/texlive-module-xifthen.doc-2017.tar.xz mirror://gentoo/texlive-module-xint.doc-2017.tar.xz mirror://gentoo/texlive-module-xmpincl.doc-2017.tar.xz mirror://gentoo/texlive-module-xnewcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-xoptarg.doc-2017.tar.xz mirror://gentoo/texlive-module-xpatch.doc-2017.tar.xz mirror://gentoo/texlive-module-xpeek.doc-2017.tar.xz mirror://gentoo/texlive-module-xprintlen.doc-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate.doc-2017.tar.xz mirror://gentoo/texlive-module-xsavebox.doc-2017.tar.xz mirror://gentoo/texlive-module-xsim.doc-2017.tar.xz mirror://gentoo/texlive-module-xstring.doc-2017.tar.xz mirror://gentoo/texlive-module-xtab.doc-2017.tar.xz mirror://gentoo/texlive-module-xwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-xytree.doc-2017.tar.xz mirror://gentoo/texlive-module-yafoot.doc-2017.tar.xz mirror://gentoo/texlive-module-yaletter.doc-2017.tar.xz mirror://gentoo/texlive-module-yagusylo.doc-2017.tar.xz mirror://gentoo/texlive-module-ycbook.doc-2017.tar.xz mirror://gentoo/texlive-module-ydoc.doc-2017.tar.xz mirror://gentoo/texlive-module-yplan.doc-2017.tar.xz mirror://gentoo/texlive-module-zed-csp.doc-2017.tar.xz mirror://gentoo/texlive-module-ziffer.doc-2017.tar.xz mirror://gentoo/texlive-module-zwgetfdate.doc-2017.tar.xz mirror://gentoo/texlive-module-zwpagelayout.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ESIEEcv.source-2017.tar.xz mirror://gentoo/texlive-module-GS1.source-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper.source-2017.tar.xz mirror://gentoo/texlive-module-Tabbing.source-2017.tar.xz mirror://gentoo/texlive-module-abstract.source-2017.tar.xz mirror://gentoo/texlive-module-achemso.source-2017.tar.xz mirror://gentoo/texlive-module-acronym.source-2017.tar.xz mirror://gentoo/texlive-module-acroterm.source-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle.source-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-addlines.source-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol.source-2017.tar.xz mirror://gentoo/texlive-module-adjustbox.source-2017.tar.xz mirror://gentoo/texlive-module-adrconv.source-2017.tar.xz mirror://gentoo/texlive-module-alertmessage.source-2017.tar.xz mirror://gentoo/texlive-module-alnumsec.source-2017.tar.xz mirror://gentoo/texlive-module-altfont.source-2017.tar.xz mirror://gentoo/texlive-module-amsaddr.source-2017.tar.xz mirror://gentoo/texlive-module-animate.source-2017.tar.xz mirror://gentoo/texlive-module-answers.source-2017.tar.xz mirror://gentoo/texlive-module-appendix.source-2017.tar.xz mirror://gentoo/texlive-module-apptools.source-2017.tar.xz mirror://gentoo/texlive-module-arcs.source-2017.tar.xz mirror://gentoo/texlive-module-arraysort.source-2017.tar.xz mirror://gentoo/texlive-module-arydshln.source-2017.tar.xz mirror://gentoo/texlive-module-asciilist.source-2017.tar.xz mirror://gentoo/texlive-module-attachfile.source-2017.tar.xz mirror://gentoo/texlive-module-autonum.source-2017.tar.xz mirror://gentoo/texlive-module-autopdf.source-2017.tar.xz mirror://gentoo/texlive-module-avremu.source-2017.tar.xz mirror://gentoo/texlive-module-background.source-2017.tar.xz mirror://gentoo/texlive-module-basicarith.source-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.source-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe.source-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.source-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.source-2017.tar.xz mirror://gentoo/texlive-module-beton.source-2017.tar.xz mirror://gentoo/texlive-module-bewerbung.source-2017.tar.xz mirror://gentoo/texlive-module-bez123.source-2017.tar.xz mirror://gentoo/texlive-module-bhcexam.source-2017.tar.xz mirror://gentoo/texlive-module-bigfoot.source-2017.tar.xz mirror://gentoo/texlive-module-bizcard.source-2017.tar.xz mirror://gentoo/texlive-module-blindtext.source-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr.source-2017.tar.xz mirror://gentoo/texlive-module-boites.source-2017.tar.xz mirror://gentoo/texlive-module-bookcover.source-2017.tar.xz mirror://gentoo/texlive-module-booklet.source-2017.tar.xz mirror://gentoo/texlive-module-boolexpr.source-2017.tar.xz mirror://gentoo/texlive-module-bophook.source-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.source-2017.tar.xz mirror://gentoo/texlive-module-boxhandler.source-2017.tar.xz mirror://gentoo/texlive-module-breakurl.source-2017.tar.xz mirror://gentoo/texlive-module-bullcntr.source-2017.tar.xz mirror://gentoo/texlive-module-calcage.source-2017.tar.xz mirror://gentoo/texlive-module-calculator.source-2017.tar.xz mirror://gentoo/texlive-module-cals.source-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout.source-2017.tar.xz mirror://gentoo/texlive-module-capt-of.source-2017.tar.xz mirror://gentoo/texlive-module-captcont.source-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.source-2017.tar.xz mirror://gentoo/texlive-module-catechis.source-2017.tar.xz mirror://gentoo/texlive-module-ccaption.source-2017.tar.xz mirror://gentoo/texlive-module-cclicenses.source-2017.tar.xz mirror://gentoo/texlive-module-cd.source-2017.tar.xz mirror://gentoo/texlive-module-cd-cover.source-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl.source-2017.tar.xz mirror://gentoo/texlive-module-changebar.source-2017.tar.xz mirror://gentoo/texlive-module-changepage.source-2017.tar.xz mirror://gentoo/texlive-module-changes.source-2017.tar.xz mirror://gentoo/texlive-module-chappg.source-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder.source-2017.tar.xz mirror://gentoo/texlive-module-chextras.source-2017.tar.xz mirror://gentoo/texlive-module-childdoc.source-2017.tar.xz mirror://gentoo/texlive-module-chletter.source-2017.tar.xz mirror://gentoo/texlive-module-circ.source-2017.tar.xz mirror://gentoo/texlive-module-classpack.source-2017.tar.xz mirror://gentoo/texlive-module-clefval.source-2017.tar.xz mirror://gentoo/texlive-module-cleveref.source-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack.source-2017.tar.xz mirror://gentoo/texlive-module-codepage.source-2017.tar.xz mirror://gentoo/texlive-module-codesection.source-2017.tar.xz mirror://gentoo/texlive-module-collcell.source-2017.tar.xz mirror://gentoo/texlive-module-collectbox.source-2017.tar.xz mirror://gentoo/texlive-module-colordoc.source-2017.tar.xz mirror://gentoo/texlive-module-colorwav.source-2017.tar.xz mirror://gentoo/texlive-module-colorweb.source-2017.tar.xz mirror://gentoo/texlive-module-combine.source-2017.tar.xz mirror://gentoo/texlive-module-commado.source-2017.tar.xz mirror://gentoo/texlive-module-constants.source-2017.tar.xz mirror://gentoo/texlive-module-continue.source-2017.tar.xz mirror://gentoo/texlive-module-contour.source-2017.tar.xz mirror://gentoo/texlive-module-contracard.source-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv.source-2017.tar.xz mirror://gentoo/texlive-module-cooking.source-2017.tar.xz mirror://gentoo/texlive-module-cooking-units.source-2017.tar.xz mirror://gentoo/texlive-module-cool.source-2017.tar.xz mirror://gentoo/texlive-module-coollist.source-2017.tar.xz mirror://gentoo/texlive-module-coolstr.source-2017.tar.xz mirror://gentoo/texlive-module-coolthms.source-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips.source-2017.tar.xz mirror://gentoo/texlive-module-coordsys.source-2017.tar.xz mirror://gentoo/texlive-module-copyedit.source-2017.tar.xz mirror://gentoo/texlive-module-counttexruns.source-2017.tar.xz mirror://gentoo/texlive-module-coverpage.source-2017.tar.xz mirror://gentoo/texlive-module-cprotect.source-2017.tar.xz mirror://gentoo/texlive-module-crossreference.source-2017.tar.xz mirror://gentoo/texlive-module-cuisine.source-2017.tar.xz mirror://gentoo/texlive-module-currfile.source-2017.tar.xz mirror://gentoo/texlive-module-cutwin.source-2017.tar.xz mirror://gentoo/texlive-module-cyber.source-2017.tar.xz mirror://gentoo/texlive-module-cybercic.source-2017.tar.xz mirror://gentoo/texlive-module-dashbox.source-2017.tar.xz mirror://gentoo/texlive-module-dashrule.source-2017.tar.xz mirror://gentoo/texlive-module-datatool.source-2017.tar.xz mirror://gentoo/texlive-module-dateiliste.source-2017.tar.xz mirror://gentoo/texlive-module-datenumber.source-2017.tar.xz mirror://gentoo/texlive-module-datetime.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.source-2017.tar.xz mirror://gentoo/texlive-module-decimal.source-2017.tar.xz mirror://gentoo/texlive-module-decorule.source-2017.tar.xz mirror://gentoo/texlive-module-delimtxt.source-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc.source-2017.tar.xz mirror://gentoo/texlive-module-diagbox.source-2017.tar.xz mirror://gentoo/texlive-module-dialogl.source-2017.tar.xz mirror://gentoo/texlive-module-dinbrief.source-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk.source-2017.tar.xz mirror://gentoo/texlive-module-dnaseq.source-2017.tar.xz mirror://gentoo/texlive-module-doclicense.source-2017.tar.xz mirror://gentoo/texlive-module-docmfp.source-2017.tar.xz mirror://gentoo/texlive-module-docmute.source-2017.tar.xz mirror://gentoo/texlive-module-doctools.source-2017.tar.xz mirror://gentoo/texlive-module-documentation.source-2017.tar.xz mirror://gentoo/texlive-module-dotarrow.source-2017.tar.xz mirror://gentoo/texlive-module-dotseqn.source-2017.tar.xz mirror://gentoo/texlive-module-download.source-2017.tar.xz mirror://gentoo/texlive-module-dox.source-2017.tar.xz mirror://gentoo/texlive-module-dprogress.source-2017.tar.xz mirror://gentoo/texlive-module-drac.source-2017.tar.xz mirror://gentoo/texlive-module-draftcopy.source-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark.source-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe.source-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery.source-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber.source-2017.tar.xz mirror://gentoo/texlive-module-easyfig.source-2017.tar.xz mirror://gentoo/texlive-module-easyreview.source-2017.tar.xz mirror://gentoo/texlive-module-ebezier.source-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic.source-2017.tar.xz mirror://gentoo/texlive-module-ecv.source-2017.tar.xz mirror://gentoo/texlive-module-ed.source-2017.tar.xz mirror://gentoo/texlive-module-edmargin.source-2017.tar.xz mirror://gentoo/texlive-module-eemeir.source-2017.tar.xz mirror://gentoo/texlive-module-efbox.source-2017.tar.xz mirror://gentoo/texlive-module-egplot.source-2017.tar.xz mirror://gentoo/texlive-module-ellipsis.source-2017.tar.xz mirror://gentoo/texlive-module-elmath.source-2017.tar.xz mirror://gentoo/texlive-module-elocalloc.source-2017.tar.xz mirror://gentoo/texlive-module-elzcards.source-2017.tar.xz mirror://gentoo/texlive-module-emarks.source-2017.tar.xz mirror://gentoo/texlive-module-embedall.source-2017.tar.xz mirror://gentoo/texlive-module-emptypage.source-2017.tar.xz mirror://gentoo/texlive-module-endfloat.source-2017.tar.xz mirror://gentoo/texlive-module-endheads.source-2017.tar.xz mirror://gentoo/texlive-module-engpron.source-2017.tar.xz mirror://gentoo/texlive-module-engrec.source-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref.source-2017.tar.xz mirror://gentoo/texlive-module-environ.source-2017.tar.xz mirror://gentoo/texlive-module-epigraph.source-2017.tar.xz mirror://gentoo/texlive-module-epiolmec.source-2017.tar.xz mirror://gentoo/texlive-module-eqlist.source-2017.tar.xz mirror://gentoo/texlive-module-eqnalign.source-2017.tar.xz mirror://gentoo/texlive-module-eqparbox.source-2017.tar.xz mirror://gentoo/texlive-module-errata.source-2017.tar.xz mirror://gentoo/texlive-module-esdiff.source-2017.tar.xz mirror://gentoo/texlive-module-esint.source-2017.tar.xz mirror://gentoo/texlive-module-etaremune.source-2017.tar.xz mirror://gentoo/texlive-module-etextools.source-2017.tar.xz mirror://gentoo/texlive-module-etoc.source-2017.tar.xz mirror://gentoo/texlive-module-eukdate.source-2017.tar.xz mirror://gentoo/texlive-module-everyhook.source-2017.tar.xz mirror://gentoo/texlive-module-everypage.source-2017.tar.xz mirror://gentoo/texlive-module-exam-n.source-2017.tar.xz mirror://gentoo/texlive-module-examdesign.source-2017.tar.xz mirror://gentoo/texlive-module-exercise.source-2017.tar.xz mirror://gentoo/texlive-module-exercises.source-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt.source-2017.tar.xz mirror://gentoo/texlive-module-expdlist.source-2017.tar.xz mirror://gentoo/texlive-module-export.source-2017.tar.xz mirror://gentoo/texlive-module-exsol.source-2017.tar.xz mirror://gentoo/texlive-module-extract.source-2017.tar.xz mirror://gentoo/texlive-module-facsimile.source-2017.tar.xz mirror://gentoo/texlive-module-factura.source-2017.tar.xz mirror://gentoo/texlive-module-fancylabel.source-2017.tar.xz mirror://gentoo/texlive-module-fancynum.source-2017.tar.xz mirror://gentoo/texlive-module-fancypar.source-2017.tar.xz mirror://gentoo/texlive-module-fancytabs.source-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips.source-2017.tar.xz mirror://gentoo/texlive-module-fcolumn.source-2017.tar.xz mirror://gentoo/texlive-module-fgruler.source-2017.tar.xz mirror://gentoo/texlive-module-fibeamer.source-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack.source-2017.tar.xz mirror://gentoo/texlive-module-filecontents.source-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef.source-2017.tar.xz mirror://gentoo/texlive-module-filedate.source-2017.tar.xz mirror://gentoo/texlive-module-fileinfo.source-2017.tar.xz mirror://gentoo/texlive-module-fink.source-2017.tar.xz mirror://gentoo/texlive-module-finstrut.source-2017.tar.xz mirror://gentoo/texlive-module-fithesis.source-2017.tar.xz mirror://gentoo/texlive-module-fixcmex.source-2017.tar.xz mirror://gentoo/texlive-module-fixme.source-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.source-2017.tar.xz mirror://gentoo/texlive-module-flabels.source-2017.tar.xz mirror://gentoo/texlive-module-flagderiv.source-2017.tar.xz mirror://gentoo/texlive-module-flashcards.source-2017.tar.xz mirror://gentoo/texlive-module-flippdf.source-2017.tar.xz mirror://gentoo/texlive-module-floatflt.source-2017.tar.xz mirror://gentoo/texlive-module-floatrow.source-2017.tar.xz mirror://gentoo/texlive-module-flowfram.source-2017.tar.xz mirror://gentoo/texlive-module-fmp.source-2017.tar.xz mirror://gentoo/texlive-module-fmtcount.source-2017.tar.xz mirror://gentoo/texlive-module-fnbreak.source-2017.tar.xz mirror://gentoo/texlive-module-fnumprint.source-2017.tar.xz mirror://gentoo/texlive-module-foilhtml.source-2017.tar.xz mirror://gentoo/texlive-module-fontaxes.source-2017.tar.xz mirror://gentoo/texlive-module-fonttable.source-2017.tar.xz mirror://gentoo/texlive-module-footmisc.source-2017.tar.xz mirror://gentoo/texlive-module-footmisx.source-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper.source-2017.tar.xz mirror://gentoo/texlive-module-footnoterange.source-2017.tar.xz mirror://gentoo/texlive-module-footnpag.source-2017.tar.xz mirror://gentoo/texlive-module-forarray.source-2017.tar.xz mirror://gentoo/texlive-module-foreign.source-2017.tar.xz mirror://gentoo/texlive-module-forloop.source-2017.tar.xz mirror://gentoo/texlive-module-formular.source-2017.tar.xz mirror://gentoo/texlive-module-frankenstein.source-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra.source-2017.tar.xz mirror://gentoo/texlive-module-fullblck.source-2017.tar.xz mirror://gentoo/texlive-module-fullminipage.source-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra.source-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.source-2017.tar.xz mirror://gentoo/texlive-module-fvextra.source-2017.tar.xz mirror://gentoo/texlive-module-gcite.source-2017.tar.xz mirror://gentoo/texlive-module-gender.source-2017.tar.xz mirror://gentoo/texlive-module-genmpage.source-2017.tar.xz mirror://gentoo/texlive-module-getitems.source-2017.tar.xz mirror://gentoo/texlive-module-ginpenc.source-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.source-2017.tar.xz mirror://gentoo/texlive-module-graphbox.source-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.source-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox.source-2017.tar.xz mirror://gentoo/texlive-module-grayhints.source-2017.tar.xz mirror://gentoo/texlive-module-grid.source-2017.tar.xz mirror://gentoo/texlive-module-gridset.source-2017.tar.xz mirror://gentoo/texlive-module-guitlogo.source-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath.source-2017.tar.xz mirror://gentoo/texlive-module-hanging.source-2017.tar.xz mirror://gentoo/texlive-module-hardwrap.source-2017.tar.xz mirror://gentoo/texlive-module-hc.source-2017.tar.xz mirror://gentoo/texlive-module-hhtensor.source-2017.tar.xz mirror://gentoo/texlive-module-histogr.source-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss.source-2017.tar.xz mirror://gentoo/texlive-module-hrefhide.source-2017.tar.xz mirror://gentoo/texlive-module-hyper.source-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenat.source-2017.tar.xz mirror://gentoo/texlive-module-idxlayout.source-2017.tar.xz mirror://gentoo/texlive-module-iffont.source-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg.source-2017.tar.xz mirror://gentoo/texlive-module-ifnextok.source-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage.source-2017.tar.xz mirror://gentoo/texlive-module-ifplatform.source-2017.tar.xz mirror://gentoo/texlive-module-iitem.source-2017.tar.xz mirror://gentoo/texlive-module-imakeidx.source-2017.tar.xz mirror://gentoo/texlive-module-indextools.source-2017.tar.xz mirror://gentoo/texlive-module-inlinedef.source-2017.tar.xz mirror://gentoo/texlive-module-inputtrc.source-2017.tar.xz mirror://gentoo/texlive-module-interfaces.source-2017.tar.xz mirror://gentoo/texlive-module-inversepath.source-2017.tar.xz mirror://gentoo/texlive-module-iso.source-2017.tar.xz mirror://gentoo/texlive-module-iso10303.source-2017.tar.xz mirror://gentoo/texlive-module-isodate.source-2017.tar.xz mirror://gentoo/texlive-module-isodoc.source-2017.tar.xz mirror://gentoo/texlive-module-isorot.source-2017.tar.xz mirror://gentoo/texlive-module-isotope.source-2017.tar.xz mirror://gentoo/texlive-module-issuulinks.source-2017.tar.xz mirror://gentoo/texlive-module-jvlisting.source-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum.source-2017.tar.xz mirror://gentoo/texlive-module-kerntest.source-2017.tar.xz mirror://gentoo/texlive-module-keycommand.source-2017.tar.xz mirror://gentoo/texlive-module-keyfloat.source-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable.source-2017.tar.xz mirror://gentoo/texlive-module-komacv.source-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata.source-2017.tar.xz mirror://gentoo/texlive-module-l3build.source-2017.tar.xz mirror://gentoo/texlive-module-labbook.source-2017.tar.xz mirror://gentoo/texlive-module-labels.source-2017.tar.xz mirror://gentoo/texlive-module-lastpackage.source-2017.tar.xz mirror://gentoo/texlive-module-lastpage.source-2017.tar.xz mirror://gentoo/texlive-module-latex-tds.source-2017.tar.xz mirror://gentoo/texlive-module-latexdemo.source-2017.tar.xz mirror://gentoo/texlive-module-latexgit.source-2017.tar.xz mirror://gentoo/texlive-module-layouts.source-2017.tar.xz mirror://gentoo/texlive-module-lcd.source-2017.tar.xz mirror://gentoo/texlive-module-lcg.source-2017.tar.xz mirror://gentoo/texlive-module-leading.source-2017.tar.xz mirror://gentoo/texlive-module-leftidx.source-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert.source-2017.tar.xz mirror://gentoo/texlive-module-lettrine.source-2017.tar.xz mirror://gentoo/texlive-module-lhelp.source-2017.tar.xz mirror://gentoo/texlive-module-libgreek.source-2017.tar.xz mirror://gentoo/texlive-module-limap.source-2017.tar.xz mirror://gentoo/texlive-module-linegoal.source-2017.tar.xz mirror://gentoo/texlive-module-lipsum.source-2017.tar.xz mirror://gentoo/texlive-module-listlbls.source-2017.tar.xz mirror://gentoo/texlive-module-listliketab.source-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-lmake.source-2017.tar.xz mirror://gentoo/texlive-module-locality.source-2017.tar.xz mirror://gentoo/texlive-module-localloc.source-2017.tar.xz mirror://gentoo/texlive-module-logbox.source-2017.tar.xz mirror://gentoo/texlive-module-logpap.source-2017.tar.xz mirror://gentoo/texlive-module-longfigure.source-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist.source-2017.tar.xz mirror://gentoo/texlive-module-lstaddons.source-2017.tar.xz mirror://gentoo/texlive-module-ltxindex.source-2017.tar.xz mirror://gentoo/texlive-module-ltxnew.source-2017.tar.xz mirror://gentoo/texlive-module-macroswap.source-2017.tar.xz mirror://gentoo/texlive-module-mailing.source-2017.tar.xz mirror://gentoo/texlive-module-mailmerge.source-2017.tar.xz mirror://gentoo/texlive-module-makebase.source-2017.tar.xz mirror://gentoo/texlive-module-makebox.source-2017.tar.xz mirror://gentoo/texlive-module-makecell.source-2017.tar.xz mirror://gentoo/texlive-module-makecmds.source-2017.tar.xz mirror://gentoo/texlive-module-makedtx.source-2017.tar.xz mirror://gentoo/texlive-module-mandi.source-2017.tar.xz mirror://gentoo/texlive-module-manfnt.source-2017.tar.xz mirror://gentoo/texlive-module-manuscript.source-2017.tar.xz mirror://gentoo/texlive-module-marginfix.source-2017.tar.xz mirror://gentoo/texlive-module-marginnote.source-2017.tar.xz mirror://gentoo/texlive-module-markdown.source-2017.tar.xz mirror://gentoo/texlive-module-mathastext.source-2017.tar.xz mirror://gentoo/texlive-module-mathexam.source-2017.tar.xz mirror://gentoo/texlive-module-mcaption.source-2017.tar.xz mirror://gentoo/texlive-module-mcite.source-2017.tar.xz mirror://gentoo/texlive-module-mdframed.source-2017.tar.xz mirror://gentoo/texlive-module-media9.source-2017.tar.xz mirror://gentoo/texlive-module-meetingmins.source-2017.tar.xz mirror://gentoo/texlive-module-memory.source-2017.tar.xz mirror://gentoo/texlive-module-menu.source-2017.tar.xz mirror://gentoo/texlive-module-menukeys.source-2017.tar.xz mirror://gentoo/texlive-module-method.source-2017.tar.xz mirror://gentoo/texlive-module-metre.source-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc.source-2017.tar.xz mirror://gentoo/texlive-module-mftinc.source-2017.tar.xz mirror://gentoo/texlive-module-minibox.source-2017.tar.xz mirror://gentoo/texlive-module-minidocument.source-2017.tar.xz mirror://gentoo/texlive-module-minifp.source-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.source-2017.tar.xz mirror://gentoo/texlive-module-minted.source-2017.tar.xz mirror://gentoo/texlive-module-minutes.source-2017.tar.xz mirror://gentoo/texlive-module-mlist.source-2017.tar.xz mirror://gentoo/texlive-module-mnotes.source-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline.source-2017.tar.xz mirror://gentoo/texlive-module-modref.source-2017.tar.xz mirror://gentoo/texlive-module-modroman.source-2017.tar.xz mirror://gentoo/texlive-module-monofill.source-2017.tar.xz mirror://gentoo/texlive-module-moodle.source-2017.tar.xz mirror://gentoo/texlive-module-morefloats.source-2017.tar.xz mirror://gentoo/texlive-module-morehype.source-2017.tar.xz mirror://gentoo/texlive-module-moresize.source-2017.tar.xz mirror://gentoo/texlive-module-moreverb.source-2017.tar.xz mirror://gentoo/texlive-module-morewrites.source-2017.tar.xz mirror://gentoo/texlive-module-mparhack.source-2017.tar.xz mirror://gentoo/texlive-module-mpostinl.source-2017.tar.xz mirror://gentoo/texlive-module-msg.source-2017.tar.xz mirror://gentoo/texlive-module-mtgreek.source-2017.tar.xz mirror://gentoo/texlive-module-multiaudience.source-2017.tar.xz mirror://gentoo/texlive-module-multibbl.source-2017.tar.xz mirror://gentoo/texlive-module-multicap.source-2017.tar.xz mirror://gentoo/texlive-module-multidef.source-2017.tar.xz mirror://gentoo/texlive-module-multienv.source-2017.tar.xz mirror://gentoo/texlive-module-multiexpand.source-2017.tar.xz mirror://gentoo/texlive-module-multirow.source-2017.tar.xz mirror://gentoo/texlive-module-mversion.source-2017.tar.xz mirror://gentoo/texlive-module-mwe.source-2017.tar.xz mirror://gentoo/texlive-module-mycv.source-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat.source-2017.tar.xz mirror://gentoo/texlive-module-nag.source-2017.tar.xz mirror://gentoo/texlive-module-nameauth.source-2017.tar.xz mirror://gentoo/texlive-module-namespc.source-2017.tar.xz mirror://gentoo/texlive-module-ncctools.source-2017.tar.xz mirror://gentoo/texlive-module-needspace.source-2017.tar.xz mirror://gentoo/texlive-module-newfile.source-2017.tar.xz mirror://gentoo/texlive-module-newlfm.source-2017.tar.xz mirror://gentoo/texlive-module-newspaper.source-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar.source-2017.tar.xz mirror://gentoo/texlive-module-newvbtm.source-2017.tar.xz mirror://gentoo/texlive-module-newverbs.source-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist.source-2017.tar.xz mirror://gentoo/texlive-module-niceframe.source-2017.tar.xz mirror://gentoo/texlive-module-nicetext.source-2017.tar.xz mirror://gentoo/texlive-module-noitcrul.source-2017.tar.xz mirror://gentoo/texlive-module-nomencl.source-2017.tar.xz mirror://gentoo/texlive-module-nomentbl.source-2017.tar.xz mirror://gentoo/texlive-module-nonfloat.source-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart.source-2017.tar.xz mirror://gentoo/texlive-module-normalcolor.source-2017.tar.xz mirror://gentoo/texlive-module-notes.source-2017.tar.xz mirror://gentoo/texlive-module-notespages.source-2017.tar.xz mirror://gentoo/texlive-module-nowidow.source-2017.tar.xz mirror://gentoo/texlive-module-ntheorem.source-2017.tar.xz mirror://gentoo/texlive-module-numprint.source-2017.tar.xz mirror://gentoo/texlive-module-ocgx.source-2017.tar.xz mirror://gentoo/texlive-module-octavo.source-2017.tar.xz mirror://gentoo/texlive-module-oldstyle.source-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath.source-2017.tar.xz mirror://gentoo/texlive-module-opcit.source-2017.tar.xz mirror://gentoo/texlive-module-pagecolor.source-2017.tar.xz mirror://gentoo/texlive-module-pagecont.source-2017.tar.xz mirror://gentoo/texlive-module-pagenote.source-2017.tar.xz mirror://gentoo/texlive-module-pageslts.source-2017.tar.xz mirror://gentoo/texlive-module-paper.source-2017.tar.xz mirror://gentoo/texlive-module-papercdcase.source-2017.tar.xz mirror://gentoo/texlive-module-papermas.source-2017.tar.xz mirror://gentoo/texlive-module-papertex.source-2017.tar.xz mirror://gentoo/texlive-module-paracol.source-2017.tar.xz mirror://gentoo/texlive-module-paralist.source-2017.tar.xz mirror://gentoo/texlive-module-paresse.source-2017.tar.xz mirror://gentoo/texlive-module-parselines.source-2017.tar.xz mirror://gentoo/texlive-module-patch.source-2017.tar.xz mirror://gentoo/texlive-module-patchcmd.source-2017.tar.xz mirror://gentoo/texlive-module-pauldoc.source-2017.tar.xz mirror://gentoo/texlive-module-pawpict.source-2017.tar.xz mirror://gentoo/texlive-module-pbox.source-2017.tar.xz mirror://gentoo/texlive-module-pbsheet.source-2017.tar.xz mirror://gentoo/texlive-module-pdf14.source-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot.source-2017.tar.xz mirror://gentoo/texlive-module-pdfx.source-2017.tar.xz mirror://gentoo/texlive-module-perltex.source-2017.tar.xz mirror://gentoo/texlive-module-permute.source-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.source-2017.tar.xz mirror://gentoo/texlive-module-phfnote.source-2017.tar.xz mirror://gentoo/texlive-module-phfparen.source-2017.tar.xz mirror://gentoo/texlive-module-phfqit.source-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext.source-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.source-2017.tar.xz mirror://gentoo/texlive-module-phfthm.source-2017.tar.xz mirror://gentoo/texlive-module-photo.source-2017.tar.xz mirror://gentoo/texlive-module-plweb.source-2017.tar.xz mirror://gentoo/texlive-module-polynom.source-2017.tar.xz mirror://gentoo/texlive-module-polynomial.source-2017.tar.xz mirror://gentoo/texlive-module-polytable.source-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv.source-2017.tar.xz mirror://gentoo/texlive-module-preprint.source-2017.tar.xz mirror://gentoo/texlive-module-pressrelease.source-2017.tar.xz mirror://gentoo/texlive-module-prettyref.source-2017.tar.xz mirror://gentoo/texlive-module-preview.source-2017.tar.xz mirror://gentoo/texlive-module-probsoln.source-2017.tar.xz mirror://gentoo/texlive-module-proofread.source-2017.tar.xz mirror://gentoo/texlive-module-protocol.source-2017.tar.xz mirror://gentoo/texlive-module-psfragx.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf.source-2017.tar.xz mirror://gentoo/texlive-module-pstool.source-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks.source-2017.tar.xz mirror://gentoo/texlive-module-qcm.source-2017.tar.xz mirror://gentoo/texlive-module-qstest.source-2017.tar.xz mirror://gentoo/texlive-module-qsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-quotchap.source-2017.tar.xz mirror://gentoo/texlive-module-quoting.source-2017.tar.xz mirror://gentoo/texlive-module-quotmark.source-2017.tar.xz mirror://gentoo/texlive-module-ran_toks.source-2017.tar.xz mirror://gentoo/texlive-module-rccol.source-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi.source-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo.source-2017.tar.xz mirror://gentoo/texlive-module-realboxes.source-2017.tar.xz mirror://gentoo/texlive-module-recipecard.source-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-refman.source-2017.tar.xz mirror://gentoo/texlive-module-refstyle.source-2017.tar.xz mirror://gentoo/texlive-module-regcount.source-2017.tar.xz mirror://gentoo/texlive-module-regexpatch.source-2017.tar.xz mirror://gentoo/texlive-module-register.source-2017.tar.xz mirror://gentoo/texlive-module-regstats.source-2017.tar.xz mirror://gentoo/texlive-module-relenc.source-2017.tar.xz mirror://gentoo/texlive-module-repltext.source-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap.source-2017.tar.xz mirror://gentoo/texlive-module-robustcommand.source-2017.tar.xz mirror://gentoo/texlive-module-romanbar.source-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.source-2017.tar.xz mirror://gentoo/texlive-module-romannum.source-2017.tar.xz mirror://gentoo/texlive-module-rotfloat.source-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc.source-2017.tar.xz mirror://gentoo/texlive-module-rulercompass.source-2017.tar.xz mirror://gentoo/texlive-module-sauerj.source-2017.tar.xz mirror://gentoo/texlive-module-savefnmark.source-2017.tar.xz mirror://gentoo/texlive-module-savetrees.source-2017.tar.xz mirror://gentoo/texlive-module-scale.source-2017.tar.xz mirror://gentoo/texlive-module-scalebar.source-2017.tar.xz mirror://gentoo/texlive-module-sectsty.source-2017.tar.xz mirror://gentoo/texlive-module-seealso.source-2017.tar.xz mirror://gentoo/texlive-module-semantic.source-2017.tar.xz mirror://gentoo/texlive-module-semioneside.source-2017.tar.xz mirror://gentoo/texlive-module-semproc.source-2017.tar.xz mirror://gentoo/texlive-module-seqsplit.source-2017.tar.xz mirror://gentoo/texlive-module-sesstime.source-2017.tar.xz mirror://gentoo/texlive-module-sf298.source-2017.tar.xz mirror://gentoo/texlive-module-sffms.source-2017.tar.xz mirror://gentoo/texlive-module-shdoc.source-2017.tar.xz mirror://gentoo/texlive-module-shorttoc.source-2017.tar.xz mirror://gentoo/texlive-module-show2e.source-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox.source-2017.tar.xz mirror://gentoo/texlive-module-showexpl.source-2017.tar.xz mirror://gentoo/texlive-module-showlabels.source-2017.tar.xz mirror://gentoo/texlive-module-sidecap.source-2017.tar.xz mirror://gentoo/texlive-module-sidenotes.source-2017.tar.xz mirror://gentoo/texlive-module-silence.source-2017.tar.xz mirror://gentoo/texlive-module-simplecd.source-2017.tar.xz mirror://gentoo/texlive-module-simplecv.source-2017.tar.xz mirror://gentoo/texlive-module-sitem.source-2017.tar.xz mirror://gentoo/texlive-module-skb.source-2017.tar.xz mirror://gentoo/texlive-module-skdoc.source-2017.tar.xz mirror://gentoo/texlive-module-skrapport.source-2017.tar.xz mirror://gentoo/texlive-module-slantsc.source-2017.tar.xz mirror://gentoo/texlive-module-snapshot.source-2017.tar.xz mirror://gentoo/texlive-module-soul.source-2017.tar.xz mirror://gentoo/texlive-module-splitindex.source-2017.tar.xz mirror://gentoo/texlive-module-spot.source-2017.tar.xz mirror://gentoo/texlive-module-spverbatim.source-2017.tar.xz mirror://gentoo/texlive-module-srcltx.source-2017.tar.xz mirror://gentoo/texlive-module-sseq.source-2017.tar.xz mirror://gentoo/texlive-module-stack.source-2017.tar.xz mirror://gentoo/texlive-module-standalone.source-2017.tar.xz mirror://gentoo/texlive-module-statistik.source-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv.source-2017.tar.xz mirror://gentoo/texlive-module-stdpage.source-2017.tar.xz mirror://gentoo/texlive-module-stex.source-2017.tar.xz mirror://gentoo/texlive-module-storebox.source-2017.tar.xz mirror://gentoo/texlive-module-stringstrings.source-2017.tar.xz mirror://gentoo/texlive-module-sttools.source-2017.tar.xz mirror://gentoo/texlive-module-subdepth.source-2017.tar.xz mirror://gentoo/texlive-module-subeqn.source-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray.source-2017.tar.xz mirror://gentoo/texlive-module-subfigure.source-2017.tar.xz mirror://gentoo/texlive-module-subfiles.source-2017.tar.xz mirror://gentoo/texlive-module-subfloat.source-2017.tar.xz mirror://gentoo/texlive-module-supertabular.source-2017.tar.xz mirror://gentoo/texlive-module-svg.source-2017.tar.xz mirror://gentoo/texlive-module-svn.source-2017.tar.xz mirror://gentoo/texlive-module-svn-multi.source-2017.tar.xz mirror://gentoo/texlive-module-svn-prov.source-2017.tar.xz mirror://gentoo/texlive-module-syntrace.source-2017.tar.xz mirror://gentoo/texlive-module-synttree.source-2017.tar.xz mirror://gentoo/texlive-module-tabfigures.source-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote.source-2017.tar.xz mirror://gentoo/texlive-module-tableof.source-2017.tar.xz mirror://gentoo/texlive-module-tablestyles.source-2017.tar.xz mirror://gentoo/texlive-module-tablists.source-2017.tar.xz mirror://gentoo/texlive-module-tabu.source-2017.tar.xz mirror://gentoo/texlive-module-tabularborder.source-2017.tar.xz mirror://gentoo/texlive-module-tabularew.source-2017.tar.xz mirror://gentoo/texlive-module-tabulary.source-2017.tar.xz mirror://gentoo/texlive-module-talk.source-2017.tar.xz mirror://gentoo/texlive-module-tcldoc.source-2017.tar.xz mirror://gentoo/texlive-module-ted.source-2017.tar.xz mirror://gentoo/texlive-module-templatetools.source-2017.tar.xz mirror://gentoo/texlive-module-termcal.source-2017.tar.xz mirror://gentoo/texlive-module-termlist.source-2017.tar.xz mirror://gentoo/texlive-module-testhyphens.source-2017.tar.xz mirror://gentoo/texlive-module-testidx.source-2017.tar.xz mirror://gentoo/texlive-module-tex-label.source-2017.tar.xz mirror://gentoo/texlive-module-texmate.source-2017.tar.xz mirror://gentoo/texlive-module-texments.source-2017.tar.xz mirror://gentoo/texlive-module-texpower.source-2017.tar.xz mirror://gentoo/texlive-module-texshade.source-2017.tar.xz mirror://gentoo/texlive-module-texvc.source-2017.tar.xz mirror://gentoo/texlive-module-textfit.source-2017.tar.xz mirror://gentoo/texlive-module-textmerg.source-2017.tar.xz mirror://gentoo/texlive-module-textpos.source-2017.tar.xz mirror://gentoo/texlive-module-thmtools.source-2017.tar.xz mirror://gentoo/texlive-module-threadcol.source-2017.tar.xz mirror://gentoo/texlive-module-thumb.source-2017.tar.xz mirror://gentoo/texlive-module-thumbs.source-2017.tar.xz mirror://gentoo/texlive-module-titling.source-2017.tar.xz mirror://gentoo/texlive-module-tocbibind.source-2017.tar.xz mirror://gentoo/texlive-module-tocdata.source-2017.tar.xz mirror://gentoo/texlive-module-tocloft.source-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2.source-2017.tar.xz mirror://gentoo/texlive-module-todo.source-2017.tar.xz mirror://gentoo/texlive-module-todonotes.source-2017.tar.xz mirror://gentoo/texlive-module-toolbox.source-2017.tar.xz mirror://gentoo/texlive-module-totcount.source-2017.tar.xz mirror://gentoo/texlive-module-totpages.source-2017.tar.xz mirror://gentoo/texlive-module-trfsigns.source-2017.tar.xz mirror://gentoo/texlive-module-trimspaces.source-2017.tar.xz mirror://gentoo/texlive-module-trivfloat.source-2017.tar.xz mirror://gentoo/texlive-module-trsym.source-2017.tar.xz mirror://gentoo/texlive-module-tucv.source-2017.tar.xz mirror://gentoo/texlive-module-twoup.source-2017.tar.xz mirror://gentoo/texlive-module-txgreeks.source-2017.tar.xz mirror://gentoo/texlive-module-type1cm.source-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist.source-2017.tar.xz mirror://gentoo/texlive-module-typeface.source-2017.tar.xz mirror://gentoo/texlive-module-typogrid.source-2017.tar.xz mirror://gentoo/texlive-module-umoline.source-2017.tar.xz mirror://gentoo/texlive-module-underlin.source-2017.tar.xz mirror://gentoo/texlive-module-undolabl.source-2017.tar.xz mirror://gentoo/texlive-module-units.source-2017.tar.xz mirror://gentoo/texlive-module-unravel.source-2017.tar.xz mirror://gentoo/texlive-module-upquote.source-2017.tar.xz mirror://gentoo/texlive-module-uri.source-2017.tar.xz mirror://gentoo/texlive-module-ushort.source-2017.tar.xz mirror://gentoo/texlive-module-varindex.source-2017.tar.xz mirror://gentoo/texlive-module-versonotes.source-2017.tar.xz mirror://gentoo/texlive-module-vertbars.source-2017.tar.xz mirror://gentoo/texlive-module-vgrid.source-2017.tar.xz mirror://gentoo/texlive-module-vmargin.source-2017.tar.xz mirror://gentoo/texlive-module-volumes.source-2017.tar.xz mirror://gentoo/texlive-module-vwcol.source-2017.tar.xz mirror://gentoo/texlive-module-warpcol.source-2017.tar.xz mirror://gentoo/texlive-module-was.source-2017.tar.xz mirror://gentoo/texlive-module-widetable.source-2017.tar.xz mirror://gentoo/texlive-module-wordlike.source-2017.tar.xz mirror://gentoo/texlive-module-xargs.source-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material.source-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.source-2017.tar.xz mirror://gentoo/texlive-module-xdoc.source-2017.tar.xz mirror://gentoo/texlive-module-xellipsis.source-2017.tar.xz mirror://gentoo/texlive-module-xfor.source-2017.tar.xz mirror://gentoo/texlive-module-xint.source-2017.tar.xz mirror://gentoo/texlive-module-xmpincl.source-2017.tar.xz mirror://gentoo/texlive-module-xpatch.source-2017.tar.xz mirror://gentoo/texlive-module-xpeek.source-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate.source-2017.tar.xz mirror://gentoo/texlive-module-xsavebox.source-2017.tar.xz mirror://gentoo/texlive-module-xtab.source-2017.tar.xz mirror://gentoo/texlive-module-yafoot.source-2017.tar.xz mirror://gentoo/texlive-module-yaletter.source-2017.tar.xz mirror://gentoo/texlive-module-yagusylo.source-2017.tar.xz mirror://gentoo/texlive-module-ydoc.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f90047c6f9f5059299db7848cddd0b6
+_md5_=484bdf3ca15e8f81e35966cecfc91207
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017 b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
index bc4488ab0fe0..e29c0476b41f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
@@ -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 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-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !dev-tex/xkeyval !dev-tex/memoir !dev-tex/listings !<dev-texlive/texlive-latexextra-2017 !=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-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-anysize-2017.tar.xz mirror://gentoo/texlive-module-booktabs-2017.tar.xz mirror://gentoo/texlive-module-breqn-2017.tar.xz mirror://gentoo/texlive-module-caption-2017.tar.xz mirror://gentoo/texlive-module-cite-2017.tar.xz mirror://gentoo/texlive-module-cmap-2017.tar.xz mirror://gentoo/texlive-module-crop-2017.tar.xz mirror://gentoo/texlive-module-ctable-2017.tar.xz mirror://gentoo/texlive-module-eso-pic-2017.tar.xz mirror://gentoo/texlive-module-euenc-2017.tar.xz mirror://gentoo/texlive-module-euler-2017.tar.xz mirror://gentoo/texlive-module-extsizes-2017.tar.xz mirror://gentoo/texlive-module-fancybox-2017.tar.xz mirror://gentoo/texlive-module-fancyref-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb-2017.tar.xz mirror://gentoo/texlive-module-filehook-2017.tar.xz mirror://gentoo/texlive-module-float-2017.tar.xz mirror://gentoo/texlive-module-fontspec-2017.tar.xz mirror://gentoo/texlive-module-fp-2017.tar.xz mirror://gentoo/texlive-module-index-2017.tar.xz mirror://gentoo/texlive-module-jknapltx-2017.tar.xz mirror://gentoo/texlive-module-koma-script-2017.tar.xz mirror://gentoo/texlive-module-latexbug-2017.tar.xz mirror://gentoo/texlive-module-l3experimental-2017.tar.xz mirror://gentoo/texlive-module-l3kernel-2017.tar.xz mirror://gentoo/texlive-module-l3packages-2017.tar.xz mirror://gentoo/texlive-module-lineno-2017.tar.xz mirror://gentoo/texlive-module-listings-2017.tar.xz mirror://gentoo/texlive-module-lwarp-2017.tar.xz mirror://gentoo/texlive-module-mathspec-2017.tar.xz mirror://gentoo/texlive-module-mathtools-2017.tar.xz mirror://gentoo/texlive-module-mdwtools-2017.tar.xz mirror://gentoo/texlive-module-memoir-2017.tar.xz mirror://gentoo/texlive-module-metalogo-2017.tar.xz mirror://gentoo/texlive-module-microtype-2017.tar.xz mirror://gentoo/texlive-module-ms-2017.tar.xz mirror://gentoo/texlive-module-ntgclass-2017.tar.xz mirror://gentoo/texlive-module-parskip-2017.tar.xz mirror://gentoo/texlive-module-pdfpages-2017.tar.xz mirror://gentoo/texlive-module-polyglossia-2017.tar.xz mirror://gentoo/texlive-module-powerdot-2017.tar.xz mirror://gentoo/texlive-module-psfrag-2017.tar.xz mirror://gentoo/texlive-module-rcs-2017.tar.xz mirror://gentoo/texlive-module-sansmath-2017.tar.xz mirror://gentoo/texlive-module-section-2017.tar.xz mirror://gentoo/texlive-module-seminar-2017.tar.xz mirror://gentoo/texlive-module-sepnum-2017.tar.xz mirror://gentoo/texlive-module-setspace-2017.tar.xz mirror://gentoo/texlive-module-subfig-2017.tar.xz mirror://gentoo/texlive-module-textcase-2017.tar.xz mirror://gentoo/texlive-module-thumbpdf-2017.tar.xz mirror://gentoo/texlive-module-typehtml-2017.tar.xz mirror://gentoo/texlive-module-underscore-2017.tar.xz mirror://gentoo/texlive-module-unicode-math-2017.tar.xz mirror://gentoo/texlive-module-xkeyval-2017.tar.xz mirror://gentoo/texlive-module-xltxtra-2017.tar.xz mirror://gentoo/texlive-module-xunicode-2017.tar.xz mirror://gentoo/texlive-module-collection-latexrecommended-2017.tar.xz doc? ( mirror://gentoo/texlive-module-anysize.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs.doc-2017.tar.xz mirror://gentoo/texlive-module-breqn.doc-2017.tar.xz mirror://gentoo/texlive-module-caption.doc-2017.tar.xz mirror://gentoo/texlive-module-cite.doc-2017.tar.xz mirror://gentoo/texlive-module-cmap.doc-2017.tar.xz mirror://gentoo/texlive-module-crop.doc-2017.tar.xz mirror://gentoo/texlive-module-ctable.doc-2017.tar.xz mirror://gentoo/texlive-module-eso-pic.doc-2017.tar.xz mirror://gentoo/texlive-module-euenc.doc-2017.tar.xz mirror://gentoo/texlive-module-euler.doc-2017.tar.xz mirror://gentoo/texlive-module-extsizes.doc-2017.tar.xz mirror://gentoo/texlive-module-fancybox.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyref.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb.doc-2017.tar.xz mirror://gentoo/texlive-module-filehook.doc-2017.tar.xz mirror://gentoo/texlive-module-float.doc-2017.tar.xz mirror://gentoo/texlive-module-fontspec.doc-2017.tar.xz mirror://gentoo/texlive-module-fp.doc-2017.tar.xz mirror://gentoo/texlive-module-index.doc-2017.tar.xz mirror://gentoo/texlive-module-jknapltx.doc-2017.tar.xz mirror://gentoo/texlive-module-latexbug.doc-2017.tar.xz mirror://gentoo/texlive-module-l3experimental.doc-2017.tar.xz mirror://gentoo/texlive-module-l3kernel.doc-2017.tar.xz mirror://gentoo/texlive-module-l3packages.doc-2017.tar.xz mirror://gentoo/texlive-module-lineno.doc-2017.tar.xz mirror://gentoo/texlive-module-listings.doc-2017.tar.xz mirror://gentoo/texlive-module-lwarp.doc-2017.tar.xz mirror://gentoo/texlive-module-mathspec.doc-2017.tar.xz mirror://gentoo/texlive-module-mathtools.doc-2017.tar.xz mirror://gentoo/texlive-module-mdwtools.doc-2017.tar.xz mirror://gentoo/texlive-module-memoir.doc-2017.tar.xz mirror://gentoo/texlive-module-metalogo.doc-2017.tar.xz mirror://gentoo/texlive-module-microtype.doc-2017.tar.xz mirror://gentoo/texlive-module-ms.doc-2017.tar.xz mirror://gentoo/texlive-module-ntgclass.doc-2017.tar.xz mirror://gentoo/texlive-module-parskip.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfpages.doc-2017.tar.xz mirror://gentoo/texlive-module-polyglossia.doc-2017.tar.xz mirror://gentoo/texlive-module-powerdot.doc-2017.tar.xz mirror://gentoo/texlive-module-psfrag.doc-2017.tar.xz mirror://gentoo/texlive-module-rcs.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmath.doc-2017.tar.xz mirror://gentoo/texlive-module-section.doc-2017.tar.xz mirror://gentoo/texlive-module-seminar.doc-2017.tar.xz mirror://gentoo/texlive-module-sepnum.doc-2017.tar.xz mirror://gentoo/texlive-module-setspace.doc-2017.tar.xz mirror://gentoo/texlive-module-subfig.doc-2017.tar.xz mirror://gentoo/texlive-module-textcase.doc-2017.tar.xz mirror://gentoo/texlive-module-thumbpdf.doc-2017.tar.xz mirror://gentoo/texlive-module-typehtml.doc-2017.tar.xz mirror://gentoo/texlive-module-underscore.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-math.doc-2017.tar.xz mirror://gentoo/texlive-module-xkeyval.doc-2017.tar.xz mirror://gentoo/texlive-module-xltxtra.doc-2017.tar.xz mirror://gentoo/texlive-module-xunicode.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-booktabs.source-2017.tar.xz mirror://gentoo/texlive-module-breqn.source-2017.tar.xz mirror://gentoo/texlive-module-caption.source-2017.tar.xz mirror://gentoo/texlive-module-crop.source-2017.tar.xz mirror://gentoo/texlive-module-ctable.source-2017.tar.xz mirror://gentoo/texlive-module-eso-pic.source-2017.tar.xz mirror://gentoo/texlive-module-euenc.source-2017.tar.xz mirror://gentoo/texlive-module-euler.source-2017.tar.xz mirror://gentoo/texlive-module-fancyref.source-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb.source-2017.tar.xz mirror://gentoo/texlive-module-filehook.source-2017.tar.xz mirror://gentoo/texlive-module-float.source-2017.tar.xz mirror://gentoo/texlive-module-fontspec.source-2017.tar.xz mirror://gentoo/texlive-module-index.source-2017.tar.xz mirror://gentoo/texlive-module-latexbug.source-2017.tar.xz mirror://gentoo/texlive-module-l3experimental.source-2017.tar.xz mirror://gentoo/texlive-module-l3kernel.source-2017.tar.xz mirror://gentoo/texlive-module-l3packages.source-2017.tar.xz mirror://gentoo/texlive-module-lineno.source-2017.tar.xz mirror://gentoo/texlive-module-listings.source-2017.tar.xz mirror://gentoo/texlive-module-lwarp.source-2017.tar.xz mirror://gentoo/texlive-module-mathtools.source-2017.tar.xz mirror://gentoo/texlive-module-mdwtools.source-2017.tar.xz mirror://gentoo/texlive-module-memoir.source-2017.tar.xz mirror://gentoo/texlive-module-metalogo.source-2017.tar.xz mirror://gentoo/texlive-module-microtype.source-2017.tar.xz mirror://gentoo/texlive-module-ms.source-2017.tar.xz mirror://gentoo/texlive-module-ntgclass.source-2017.tar.xz mirror://gentoo/texlive-module-pdfpages.source-2017.tar.xz mirror://gentoo/texlive-module-polyglossia.source-2017.tar.xz mirror://gentoo/texlive-module-powerdot.source-2017.tar.xz mirror://gentoo/texlive-module-psfrag.source-2017.tar.xz mirror://gentoo/texlive-module-rcs.source-2017.tar.xz mirror://gentoo/texlive-module-subfig.source-2017.tar.xz mirror://gentoo/texlive-module-textcase.source-2017.tar.xz mirror://gentoo/texlive-module-typehtml.source-2017.tar.xz mirror://gentoo/texlive-module-unicode-math.source-2017.tar.xz mirror://gentoo/texlive-module-xkeyval.source-2017.tar.xz mirror://gentoo/texlive-module-xltxtra.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5d57f524b73c37c7a277c61f29badb5
+_md5_=88b5d6f7931e6d27020320111272dc4e
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2017 b/metadata/md5-cache/dev-texlive/texlive-luatex-2017
index 8e3ce86bb052..e33b1fe8379f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-luatex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-luatex-2017
@@ -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 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=BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 dev-texlive/texlive-latexrecommended >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-checkcites-2017.tar.xz mirror://gentoo/texlive-module-chickenize-2017.tar.xz mirror://gentoo/texlive-module-cloze-2017.tar.xz mirror://gentoo/texlive-module-cstypo-2017.tar.xz mirror://gentoo/texlive-module-ctablestack-2017.tar.xz mirror://gentoo/texlive-module-enigma-2017.tar.xz mirror://gentoo/texlive-module-interpreter-2017.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen-2017.tar.xz mirror://gentoo/texlive-module-lua-visual-debug-2017.tar.xz mirror://gentoo/texlive-module-lua2dox-2017.tar.xz mirror://gentoo/texlive-module-luabibentry-2017.tar.xz mirror://gentoo/texlive-module-luabidi-2017.tar.xz mirror://gentoo/texlive-module-luacode-2017.tar.xz mirror://gentoo/texlive-module-luahyphenrules-2017.tar.xz mirror://gentoo/texlive-module-luaindex-2017.tar.xz mirror://gentoo/texlive-module-luainputenc-2017.tar.xz mirror://gentoo/texlive-module-luaintro-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math-2017.tar.xz mirror://gentoo/texlive-module-lualibs-2017.tar.xz mirror://gentoo/texlive-module-luamplib-2017.tar.xz mirror://gentoo/texlive-module-luaotfload-2017.tar.xz mirror://gentoo/texlive-module-luasseq-2017.tar.xz mirror://gentoo/texlive-module-luatex85-2017.tar.xz mirror://gentoo/texlive-module-luatexbase-2017.tar.xz mirror://gentoo/texlive-module-luatexko-2017.tar.xz mirror://gentoo/texlive-module-luatextra-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes-2017.tar.xz mirror://gentoo/texlive-module-luaxml-2017.tar.xz mirror://gentoo/texlive-module-nodetree-2017.tar.xz mirror://gentoo/texlive-module-odsfile-2017.tar.xz mirror://gentoo/texlive-module-placeat-2017.tar.xz mirror://gentoo/texlive-module-selnolig-2017.tar.xz mirror://gentoo/texlive-module-showhyphens-2017.tar.xz mirror://gentoo/texlive-module-spelling-2017.tar.xz mirror://gentoo/texlive-module-ucharcat-2017.tar.xz mirror://gentoo/texlive-module-collection-luatex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-checkcites.doc-2017.tar.xz mirror://gentoo/texlive-module-chickenize.doc-2017.tar.xz mirror://gentoo/texlive-module-cloze.doc-2017.tar.xz mirror://gentoo/texlive-module-cstypo.doc-2017.tar.xz mirror://gentoo/texlive-module-ctablestack.doc-2017.tar.xz mirror://gentoo/texlive-module-enigma.doc-2017.tar.xz mirror://gentoo/texlive-module-interpreter.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-visual-debug.doc-2017.tar.xz mirror://gentoo/texlive-module-lua2dox.doc-2017.tar.xz mirror://gentoo/texlive-module-luabibentry.doc-2017.tar.xz mirror://gentoo/texlive-module-luabidi.doc-2017.tar.xz mirror://gentoo/texlive-module-luacode.doc-2017.tar.xz mirror://gentoo/texlive-module-luahyphenrules.doc-2017.tar.xz mirror://gentoo/texlive-module-luaindex.doc-2017.tar.xz mirror://gentoo/texlive-module-luainputenc.doc-2017.tar.xz mirror://gentoo/texlive-module-luaintro.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math.doc-2017.tar.xz mirror://gentoo/texlive-module-lualibs.doc-2017.tar.xz mirror://gentoo/texlive-module-luamplib.doc-2017.tar.xz mirror://gentoo/texlive-module-luaotfload.doc-2017.tar.xz mirror://gentoo/texlive-module-luasseq.doc-2017.tar.xz mirror://gentoo/texlive-module-luatex85.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexbase.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexko.doc-2017.tar.xz mirror://gentoo/texlive-module-luatextra.doc-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-luaxml.doc-2017.tar.xz mirror://gentoo/texlive-module-nodetree.doc-2017.tar.xz mirror://gentoo/texlive-module-odsfile.doc-2017.tar.xz mirror://gentoo/texlive-module-placeat.doc-2017.tar.xz mirror://gentoo/texlive-module-selnolig.doc-2017.tar.xz mirror://gentoo/texlive-module-showhyphens.doc-2017.tar.xz mirror://gentoo/texlive-module-spelling.doc-2017.tar.xz mirror://gentoo/texlive-module-ucharcat.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-chickenize.source-2017.tar.xz mirror://gentoo/texlive-module-cloze.source-2017.tar.xz mirror://gentoo/texlive-module-ctablestack.source-2017.tar.xz mirror://gentoo/texlive-module-luabibentry.source-2017.tar.xz mirror://gentoo/texlive-module-luacode.source-2017.tar.xz mirror://gentoo/texlive-module-luaindex.source-2017.tar.xz mirror://gentoo/texlive-module-luainputenc.source-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc.source-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math.source-2017.tar.xz mirror://gentoo/texlive-module-lualibs.source-2017.tar.xz mirror://gentoo/texlive-module-luamplib.source-2017.tar.xz mirror://gentoo/texlive-module-luaotfload.source-2017.tar.xz mirror://gentoo/texlive-module-luasseq.source-2017.tar.xz mirror://gentoo/texlive-module-luatex85.source-2017.tar.xz mirror://gentoo/texlive-module-luatexbase.source-2017.tar.xz mirror://gentoo/texlive-module-luatextra.source-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes.source-2017.tar.xz mirror://gentoo/texlive-module-nodetree.source-2017.tar.xz mirror://gentoo/texlive-module-placeat.source-2017.tar.xz mirror://gentoo/texlive-module-ucharcat.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=726e9bf1e464094f710af12577d3b3e7
+_md5_=447a2716fd646adf17a3a7fe6c11f845
diff --git a/metadata/md5-cache/dev-texlive/texlive-mathscience-2017 b/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
index 9f594ccac125..bf8f2d37334f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
@@ -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 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=BSD BSD-2 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-2017 >=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2017 !dev-tex/SIunits !dev-texlive/texlive-mathextra !dev-texlive/texlive-science dev-texlive/texlive-pstricks >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-12many-2017.tar.xz mirror://gentoo/texlive-module-SIstyle-2017.tar.xz mirror://gentoo/texlive-module-SIunits-2017.tar.xz mirror://gentoo/texlive-module-alg-2017.tar.xz mirror://gentoo/texlive-module-algorithm2e-2017.tar.xz mirror://gentoo/texlive-module-algorithmicx-2017.tar.xz mirror://gentoo/texlive-module-algorithms-2017.tar.xz mirror://gentoo/texlive-module-amstex-2017.tar.xz mirror://gentoo/texlive-module-apxproof-2017.tar.xz mirror://gentoo/texlive-module-autobreak-2017.tar.xz mirror://gentoo/texlive-module-axodraw2-2017.tar.xz mirror://gentoo/texlive-module-backnaur-2017.tar.xz mirror://gentoo/texlive-module-begriff-2017.tar.xz mirror://gentoo/texlive-module-binomexp-2017.tar.xz mirror://gentoo/texlive-module-biocon-2017.tar.xz mirror://gentoo/texlive-module-bitpattern-2017.tar.xz mirror://gentoo/texlive-module-bohr-2017.tar.xz mirror://gentoo/texlive-module-boldtensors-2017.tar.xz mirror://gentoo/texlive-module-bosisio-2017.tar.xz mirror://gentoo/texlive-module-bpchem-2017.tar.xz mirror://gentoo/texlive-module-bropd-2017.tar.xz mirror://gentoo/texlive-module-bytefield-2017.tar.xz mirror://gentoo/texlive-module-calculation-2017.tar.xz mirror://gentoo/texlive-module-ccfonts-2017.tar.xz mirror://gentoo/texlive-module-chemarrow-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds-2017.tar.xz mirror://gentoo/texlive-module-chemcono-2017.tar.xz mirror://gentoo/texlive-module-chemexec-2017.tar.xz mirror://gentoo/texlive-module-chemformula-2017.tar.xz mirror://gentoo/texlive-module-chemgreek-2017.tar.xz mirror://gentoo/texlive-module-chemmacros-2017.tar.xz mirror://gentoo/texlive-module-chemnum-2017.tar.xz mirror://gentoo/texlive-module-chemschemex-2017.tar.xz mirror://gentoo/texlive-module-chemstyle-2017.tar.xz mirror://gentoo/texlive-module-clrscode-2017.tar.xz mirror://gentoo/texlive-module-clrscode3e-2017.tar.xz mirror://gentoo/texlive-module-commath-2017.tar.xz mirror://gentoo/texlive-module-complexity-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity-2017.tar.xz mirror://gentoo/texlive-module-concmath-2017.tar.xz mirror://gentoo/texlive-module-concrete-2017.tar.xz mirror://gentoo/texlive-module-conteq-2017.tar.xz mirror://gentoo/texlive-module-correctmathalign-2017.tar.xz mirror://gentoo/texlive-module-cryptocode-2017.tar.xz mirror://gentoo/texlive-module-delim-2017.tar.xz mirror://gentoo/texlive-module-delimset-2017.tar.xz mirror://gentoo/texlive-module-delimseasy-2017.tar.xz mirror://gentoo/texlive-module-diffcoeff-2017.tar.xz mirror://gentoo/texlive-module-digiconfigs-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix-2017.tar.xz mirror://gentoo/texlive-module-drawstack-2017.tar.xz mirror://gentoo/texlive-module-dyntree-2017.tar.xz mirror://gentoo/texlive-module-ebproof-2017.tar.xz mirror://gentoo/texlive-module-econometrics-2017.tar.xz mirror://gentoo/texlive-module-eltex-2017.tar.xz mirror://gentoo/texlive-module-emf-2017.tar.xz mirror://gentoo/texlive-module-endiagram-2017.tar.xz mirror://gentoo/texlive-module-engtlc-2017.tar.xz mirror://gentoo/texlive-module-eqnarray-2017.tar.xz mirror://gentoo/texlive-module-extarrows-2017.tar.xz mirror://gentoo/texlive-module-extpfeil-2017.tar.xz mirror://gentoo/texlive-module-faktor-2017.tar.xz mirror://gentoo/texlive-module-fnspe-2017.tar.xz mirror://gentoo/texlive-module-fouridx-2017.tar.xz mirror://gentoo/texlive-module-functan-2017.tar.xz mirror://gentoo/texlive-module-galois-2017.tar.xz mirror://gentoo/texlive-module-gastex-2017.tar.xz mirror://gentoo/texlive-module-gene-logic-2017.tar.xz mirror://gentoo/texlive-module-ghsystem-2017.tar.xz mirror://gentoo/texlive-module-gotoh-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze-2017.tar.xz mirror://gentoo/texlive-module-gu-2017.tar.xz mirror://gentoo/texlive-module-hep-2017.tar.xz mirror://gentoo/texlive-module-hepnames-2017.tar.xz mirror://gentoo/texlive-module-hepparticles-2017.tar.xz mirror://gentoo/texlive-module-hepthesis-2017.tar.xz mirror://gentoo/texlive-module-hepunits-2017.tar.xz mirror://gentoo/texlive-module-interval-2017.tar.xz mirror://gentoo/texlive-module-ionumbers-2017.tar.xz mirror://gentoo/texlive-module-isomath-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap-2017.tar.xz mirror://gentoo/texlive-module-logicproof-2017.tar.xz mirror://gentoo/texlive-module-longdivision-2017.tar.xz mirror://gentoo/texlive-module-lpform-2017.tar.xz mirror://gentoo/texlive-module-lplfitch-2017.tar.xz mirror://gentoo/texlive-module-lstbayes-2017.tar.xz mirror://gentoo/texlive-module-mathcomp-2017.tar.xz mirror://gentoo/texlive-module-mathpartir-2017.tar.xz mirror://gentoo/texlive-module-mathpunctspace-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier-2017.tar.xz mirror://gentoo/texlive-module-mattens-2017.tar.xz mirror://gentoo/texlive-module-mgltex-2017.tar.xz mirror://gentoo/texlive-module-mhchem-2017.tar.xz mirror://gentoo/texlive-module-mhequ-2017.tar.xz mirror://gentoo/texlive-module-miller-2017.tar.xz mirror://gentoo/texlive-module-multiobjective-2017.tar.xz mirror://gentoo/texlive-module-mychemistry-2017.tar.xz mirror://gentoo/texlive-module-natded-2017.tar.xz mirror://gentoo/texlive-module-nath-2017.tar.xz mirror://gentoo/texlive-module-nuc-2017.tar.xz mirror://gentoo/texlive-module-nucleardata-2017.tar.xz mirror://gentoo/texlive-module-objectz-2017.tar.xz mirror://gentoo/texlive-module-oplotsymbl-2017.tar.xz mirror://gentoo/texlive-module-ot-tableau-2017.tar.xz mirror://gentoo/texlive-module-oubraces-2017.tar.xz mirror://gentoo/texlive-module-perfectcut-2017.tar.xz mirror://gentoo/texlive-module-physics-2017.tar.xz mirror://gentoo/texlive-module-prftree-2017.tar.xz mirror://gentoo/texlive-module-proba-2017.tar.xz mirror://gentoo/texlive-module-prooftrees-2017.tar.xz mirror://gentoo/texlive-module-pseudocode-2017.tar.xz mirror://gentoo/texlive-module-pygmentex-2017.tar.xz mirror://gentoo/texlive-module-pythonhighlight-2017.tar.xz mirror://gentoo/texlive-module-rec-thy-2017.tar.xz mirror://gentoo/texlive-module-revquantum-2017.tar.xz mirror://gentoo/texlive-module-ribbonproofs-2017.tar.xz mirror://gentoo/texlive-module-rmathbr-2017.tar.xz mirror://gentoo/texlive-module-sasnrdisplay-2017.tar.xz mirror://gentoo/texlive-module-sciposter-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel-2017.tar.xz mirror://gentoo/texlive-module-sfg-2017.tar.xz mirror://gentoo/texlive-module-shuffle-2017.tar.xz mirror://gentoo/texlive-module-simpler-wick-2017.tar.xz mirror://gentoo/texlive-module-simplewick-2017.tar.xz mirror://gentoo/texlive-module-siunitx-2017.tar.xz mirror://gentoo/texlive-module-skmath-2017.tar.xz mirror://gentoo/texlive-module-spalign-2017.tar.xz mirror://gentoo/texlive-module-stanli-2017.tar.xz mirror://gentoo/texlive-module-statex-2017.tar.xz mirror://gentoo/texlive-module-statex2-2017.tar.xz mirror://gentoo/texlive-module-steinmetz-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd-2017.tar.xz mirror://gentoo/texlive-module-struktex-2017.tar.xz mirror://gentoo/texlive-module-substances-2017.tar.xz mirror://gentoo/texlive-module-subsupscripts-2017.tar.xz mirror://gentoo/texlive-module-susy-2017.tar.xz mirror://gentoo/texlive-module-syllogism-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage-2017.tar.xz mirror://gentoo/texlive-module-synproof-2017.tar.xz mirror://gentoo/texlive-module-t-angles-2017.tar.xz mirror://gentoo/texlive-module-tablor-2017.tar.xz mirror://gentoo/texlive-module-tensor-2017.tar.xz mirror://gentoo/texlive-module-tex-ewd-2017.tar.xz mirror://gentoo/texlive-module-textgreek-2017.tar.xz mirror://gentoo/texlive-module-textopo-2017.tar.xz mirror://gentoo/texlive-module-thmbox-2017.tar.xz mirror://gentoo/texlive-module-turnstile-2017.tar.xz mirror://gentoo/texlive-module-ulqda-2017.tar.xz mirror://gentoo/texlive-module-unitsdef-2017.tar.xz mirror://gentoo/texlive-module-venn-2017.tar.xz mirror://gentoo/texlive-module-xymtex-2017.tar.xz mirror://gentoo/texlive-module-yhmath-2017.tar.xz mirror://gentoo/texlive-module-youngtab-2017.tar.xz mirror://gentoo/texlive-module-ytableau-2017.tar.xz mirror://gentoo/texlive-module-collection-mathscience-2017.tar.xz doc? ( mirror://gentoo/texlive-module-12many.doc-2017.tar.xz mirror://gentoo/texlive-module-SIstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-SIunits.doc-2017.tar.xz mirror://gentoo/texlive-module-alg.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithm2e.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithmicx.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithms.doc-2017.tar.xz mirror://gentoo/texlive-module-amstex.doc-2017.tar.xz mirror://gentoo/texlive-module-apxproof.doc-2017.tar.xz mirror://gentoo/texlive-module-autobreak.doc-2017.tar.xz mirror://gentoo/texlive-module-axodraw2.doc-2017.tar.xz mirror://gentoo/texlive-module-backnaur.doc-2017.tar.xz mirror://gentoo/texlive-module-begriff.doc-2017.tar.xz mirror://gentoo/texlive-module-binomexp.doc-2017.tar.xz mirror://gentoo/texlive-module-biocon.doc-2017.tar.xz mirror://gentoo/texlive-module-bitpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-bohr.doc-2017.tar.xz mirror://gentoo/texlive-module-boldtensors.doc-2017.tar.xz mirror://gentoo/texlive-module-bosisio.doc-2017.tar.xz mirror://gentoo/texlive-module-bpchem.doc-2017.tar.xz mirror://gentoo/texlive-module-bropd.doc-2017.tar.xz mirror://gentoo/texlive-module-bytefield.doc-2017.tar.xz mirror://gentoo/texlive-module-calculation.doc-2017.tar.xz mirror://gentoo/texlive-module-ccfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-chemarrow.doc-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds.doc-2017.tar.xz mirror://gentoo/texlive-module-chemcono.doc-2017.tar.xz mirror://gentoo/texlive-module-chemexec.doc-2017.tar.xz mirror://gentoo/texlive-module-chemformula.doc-2017.tar.xz mirror://gentoo/texlive-module-chemgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-chemmacros.doc-2017.tar.xz mirror://gentoo/texlive-module-chemnum.doc-2017.tar.xz mirror://gentoo/texlive-module-chemschemex.doc-2017.tar.xz mirror://gentoo/texlive-module-chemstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-clrscode.doc-2017.tar.xz mirror://gentoo/texlive-module-clrscode3e.doc-2017.tar.xz mirror://gentoo/texlive-module-commath.doc-2017.tar.xz mirror://gentoo/texlive-module-complexity.doc-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity.doc-2017.tar.xz mirror://gentoo/texlive-module-concmath.doc-2017.tar.xz mirror://gentoo/texlive-module-concrete.doc-2017.tar.xz mirror://gentoo/texlive-module-conteq.doc-2017.tar.xz mirror://gentoo/texlive-module-correctmathalign.doc-2017.tar.xz mirror://gentoo/texlive-module-cryptocode.doc-2017.tar.xz mirror://gentoo/texlive-module-delim.doc-2017.tar.xz mirror://gentoo/texlive-module-delimset.doc-2017.tar.xz mirror://gentoo/texlive-module-delimseasy.doc-2017.tar.xz mirror://gentoo/texlive-module-diffcoeff.doc-2017.tar.xz mirror://gentoo/texlive-module-digiconfigs.doc-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix.doc-2017.tar.xz mirror://gentoo/texlive-module-drawstack.doc-2017.tar.xz mirror://gentoo/texlive-module-dyntree.doc-2017.tar.xz mirror://gentoo/texlive-module-ebproof.doc-2017.tar.xz mirror://gentoo/texlive-module-econometrics.doc-2017.tar.xz mirror://gentoo/texlive-module-eltex.doc-2017.tar.xz mirror://gentoo/texlive-module-emf.doc-2017.tar.xz mirror://gentoo/texlive-module-endiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-engtlc.doc-2017.tar.xz mirror://gentoo/texlive-module-eqnarray.doc-2017.tar.xz mirror://gentoo/texlive-module-extarrows.doc-2017.tar.xz mirror://gentoo/texlive-module-extpfeil.doc-2017.tar.xz mirror://gentoo/texlive-module-faktor.doc-2017.tar.xz mirror://gentoo/texlive-module-fnspe.doc-2017.tar.xz mirror://gentoo/texlive-module-fouridx.doc-2017.tar.xz mirror://gentoo/texlive-module-functan.doc-2017.tar.xz mirror://gentoo/texlive-module-galois.doc-2017.tar.xz mirror://gentoo/texlive-module-gastex.doc-2017.tar.xz mirror://gentoo/texlive-module-gene-logic.doc-2017.tar.xz mirror://gentoo/texlive-module-ghsystem.doc-2017.tar.xz mirror://gentoo/texlive-module-gotoh.doc-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze.doc-2017.tar.xz mirror://gentoo/texlive-module-gu.doc-2017.tar.xz mirror://gentoo/texlive-module-hep.doc-2017.tar.xz mirror://gentoo/texlive-module-hepnames.doc-2017.tar.xz mirror://gentoo/texlive-module-hepparticles.doc-2017.tar.xz mirror://gentoo/texlive-module-hepthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-hepunits.doc-2017.tar.xz mirror://gentoo/texlive-module-interval.doc-2017.tar.xz mirror://gentoo/texlive-module-ionumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-isomath.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaugh.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap.doc-2017.tar.xz mirror://gentoo/texlive-module-logicproof.doc-2017.tar.xz mirror://gentoo/texlive-module-longdivision.doc-2017.tar.xz mirror://gentoo/texlive-module-lpform.doc-2017.tar.xz mirror://gentoo/texlive-module-lplfitch.doc-2017.tar.xz mirror://gentoo/texlive-module-lstbayes.doc-2017.tar.xz mirror://gentoo/texlive-module-mathcomp.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpartir.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpunctspace.doc-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.doc-2017.tar.xz mirror://gentoo/texlive-module-mattens.doc-2017.tar.xz mirror://gentoo/texlive-module-mgltex.doc-2017.tar.xz mirror://gentoo/texlive-module-mhchem.doc-2017.tar.xz mirror://gentoo/texlive-module-mhequ.doc-2017.tar.xz mirror://gentoo/texlive-module-miller.doc-2017.tar.xz mirror://gentoo/texlive-module-multiobjective.doc-2017.tar.xz mirror://gentoo/texlive-module-mychemistry.doc-2017.tar.xz mirror://gentoo/texlive-module-natded.doc-2017.tar.xz mirror://gentoo/texlive-module-nath.doc-2017.tar.xz mirror://gentoo/texlive-module-nuc.doc-2017.tar.xz mirror://gentoo/texlive-module-nucleardata.doc-2017.tar.xz mirror://gentoo/texlive-module-objectz.doc-2017.tar.xz mirror://gentoo/texlive-module-oplotsymbl.doc-2017.tar.xz mirror://gentoo/texlive-module-ot-tableau.doc-2017.tar.xz mirror://gentoo/texlive-module-oubraces.doc-2017.tar.xz mirror://gentoo/texlive-module-perfectcut.doc-2017.tar.xz mirror://gentoo/texlive-module-physics.doc-2017.tar.xz mirror://gentoo/texlive-module-prftree.doc-2017.tar.xz mirror://gentoo/texlive-module-proba.doc-2017.tar.xz mirror://gentoo/texlive-module-prooftrees.doc-2017.tar.xz mirror://gentoo/texlive-module-pseudocode.doc-2017.tar.xz mirror://gentoo/texlive-module-pygmentex.doc-2017.tar.xz mirror://gentoo/texlive-module-pythonhighlight.doc-2017.tar.xz mirror://gentoo/texlive-module-rec-thy.doc-2017.tar.xz mirror://gentoo/texlive-module-revquantum.doc-2017.tar.xz mirror://gentoo/texlive-module-ribbonproofs.doc-2017.tar.xz mirror://gentoo/texlive-module-rmathbr.doc-2017.tar.xz mirror://gentoo/texlive-module-sasnrdisplay.doc-2017.tar.xz mirror://gentoo/texlive-module-sciposter.doc-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.doc-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel.doc-2017.tar.xz mirror://gentoo/texlive-module-sfg.doc-2017.tar.xz mirror://gentoo/texlive-module-shuffle.doc-2017.tar.xz mirror://gentoo/texlive-module-simpler-wick.doc-2017.tar.xz mirror://gentoo/texlive-module-simplewick.doc-2017.tar.xz mirror://gentoo/texlive-module-siunitx.doc-2017.tar.xz mirror://gentoo/texlive-module-skmath.doc-2017.tar.xz mirror://gentoo/texlive-module-spalign.doc-2017.tar.xz mirror://gentoo/texlive-module-stanli.doc-2017.tar.xz mirror://gentoo/texlive-module-statex.doc-2017.tar.xz mirror://gentoo/texlive-module-statex2.doc-2017.tar.xz mirror://gentoo/texlive-module-steinmetz.doc-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd.doc-2017.tar.xz mirror://gentoo/texlive-module-struktex.doc-2017.tar.xz mirror://gentoo/texlive-module-substances.doc-2017.tar.xz mirror://gentoo/texlive-module-subsupscripts.doc-2017.tar.xz mirror://gentoo/texlive-module-susy.doc-2017.tar.xz mirror://gentoo/texlive-module-syllogism.doc-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage.doc-2017.tar.xz mirror://gentoo/texlive-module-synproof.doc-2017.tar.xz mirror://gentoo/texlive-module-t-angles.doc-2017.tar.xz mirror://gentoo/texlive-module-tablor.doc-2017.tar.xz mirror://gentoo/texlive-module-tensor.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ewd.doc-2017.tar.xz mirror://gentoo/texlive-module-textgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-textopo.doc-2017.tar.xz mirror://gentoo/texlive-module-thmbox.doc-2017.tar.xz mirror://gentoo/texlive-module-turnstile.doc-2017.tar.xz mirror://gentoo/texlive-module-ulqda.doc-2017.tar.xz mirror://gentoo/texlive-module-unitsdef.doc-2017.tar.xz mirror://gentoo/texlive-module-venn.doc-2017.tar.xz mirror://gentoo/texlive-module-xymtex.doc-2017.tar.xz mirror://gentoo/texlive-module-yhmath.doc-2017.tar.xz mirror://gentoo/texlive-module-youngtab.doc-2017.tar.xz mirror://gentoo/texlive-module-ytableau.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-12many.source-2017.tar.xz mirror://gentoo/texlive-module-SIstyle.source-2017.tar.xz mirror://gentoo/texlive-module-SIunits.source-2017.tar.xz mirror://gentoo/texlive-module-alg.source-2017.tar.xz mirror://gentoo/texlive-module-algorithms.source-2017.tar.xz mirror://gentoo/texlive-module-apxproof.source-2017.tar.xz mirror://gentoo/texlive-module-autobreak.source-2017.tar.xz mirror://gentoo/texlive-module-axodraw2.source-2017.tar.xz mirror://gentoo/texlive-module-backnaur.source-2017.tar.xz mirror://gentoo/texlive-module-binomexp.source-2017.tar.xz mirror://gentoo/texlive-module-bitpattern.source-2017.tar.xz mirror://gentoo/texlive-module-bosisio.source-2017.tar.xz mirror://gentoo/texlive-module-bpchem.source-2017.tar.xz mirror://gentoo/texlive-module-bropd.source-2017.tar.xz mirror://gentoo/texlive-module-bytefield.source-2017.tar.xz mirror://gentoo/texlive-module-calculation.source-2017.tar.xz mirror://gentoo/texlive-module-ccfonts.source-2017.tar.xz mirror://gentoo/texlive-module-chemarrow.source-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds.source-2017.tar.xz mirror://gentoo/texlive-module-chemschemex.source-2017.tar.xz mirror://gentoo/texlive-module-chemstyle.source-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity.source-2017.tar.xz mirror://gentoo/texlive-module-concmath.source-2017.tar.xz mirror://gentoo/texlive-module-conteq.source-2017.tar.xz mirror://gentoo/texlive-module-delim.source-2017.tar.xz mirror://gentoo/texlive-module-delimset.source-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix.source-2017.tar.xz mirror://gentoo/texlive-module-dyntree.source-2017.tar.xz mirror://gentoo/texlive-module-eqnarray.source-2017.tar.xz mirror://gentoo/texlive-module-extpfeil.source-2017.tar.xz mirror://gentoo/texlive-module-faktor.source-2017.tar.xz mirror://gentoo/texlive-module-fouridx.source-2017.tar.xz mirror://gentoo/texlive-module-functan.source-2017.tar.xz mirror://gentoo/texlive-module-galois.source-2017.tar.xz mirror://gentoo/texlive-module-gotoh.source-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze.source-2017.tar.xz mirror://gentoo/texlive-module-ionumbers.source-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map.source-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap.source-2017.tar.xz mirror://gentoo/texlive-module-logicproof.source-2017.tar.xz mirror://gentoo/texlive-module-lplfitch.source-2017.tar.xz mirror://gentoo/texlive-module-lstbayes.source-2017.tar.xz mirror://gentoo/texlive-module-mathcomp.source-2017.tar.xz mirror://gentoo/texlive-module-mathpartir.source-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.source-2017.tar.xz mirror://gentoo/texlive-module-mattens.source-2017.tar.xz mirror://gentoo/texlive-module-mgltex.source-2017.tar.xz mirror://gentoo/texlive-module-miller.source-2017.tar.xz mirror://gentoo/texlive-module-multiobjective.source-2017.tar.xz mirror://gentoo/texlive-module-nucleardata.source-2017.tar.xz mirror://gentoo/texlive-module-objectz.source-2017.tar.xz mirror://gentoo/texlive-module-proba.source-2017.tar.xz mirror://gentoo/texlive-module-revquantum.source-2017.tar.xz mirror://gentoo/texlive-module-rmathbr.source-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.source-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel.source-2017.tar.xz mirror://gentoo/texlive-module-shuffle.source-2017.tar.xz mirror://gentoo/texlive-module-simplewick.source-2017.tar.xz mirror://gentoo/texlive-module-siunitx.source-2017.tar.xz mirror://gentoo/texlive-module-skmath.source-2017.tar.xz mirror://gentoo/texlive-module-spalign.source-2017.tar.xz mirror://gentoo/texlive-module-steinmetz.source-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd.source-2017.tar.xz mirror://gentoo/texlive-module-struktex.source-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage.source-2017.tar.xz mirror://gentoo/texlive-module-tensor.source-2017.tar.xz mirror://gentoo/texlive-module-textgreek.source-2017.tar.xz mirror://gentoo/texlive-module-textopo.source-2017.tar.xz mirror://gentoo/texlive-module-thmbox.source-2017.tar.xz mirror://gentoo/texlive-module-turnstile.source-2017.tar.xz mirror://gentoo/texlive-module-ulqda.source-2017.tar.xz mirror://gentoo/texlive-module-unitsdef.source-2017.tar.xz mirror://gentoo/texlive-module-xymtex.source-2017.tar.xz mirror://gentoo/texlive-module-yhmath.source-2017.tar.xz mirror://gentoo/texlive-module-youngtab.source-2017.tar.xz mirror://gentoo/texlive-module-ytableau.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5de56ccb5fb5b22f60501e58c176f978
+_md5_=6fe6c75ab38aa65c1b7fede2175bc56d
diff --git a/metadata/md5-cache/dev-texlive/texlive-metapost-2017 b/metadata/md5-cache/dev-texlive/texlive-metapost-2017
index 5f6d8160659d..439ed089da7c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-metapost-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-metapost-2017
@@ -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 ~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=BSD GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-automata-2017.tar.xz mirror://gentoo/texlive-module-bbcard-2017.tar.xz mirror://gentoo/texlive-module-blockdraw_mp-2017.tar.xz mirror://gentoo/texlive-module-bpolynomial-2017.tar.xz mirror://gentoo/texlive-module-cmarrows-2017.tar.xz mirror://gentoo/texlive-module-drv-2017.tar.xz mirror://gentoo/texlive-module-dviincl-2017.tar.xz mirror://gentoo/texlive-module-emp-2017.tar.xz mirror://gentoo/texlive-module-epsincl-2017.tar.xz mirror://gentoo/texlive-module-expressg-2017.tar.xz mirror://gentoo/texlive-module-exteps-2017.tar.xz mirror://gentoo/texlive-module-featpost-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto-2017.tar.xz mirror://gentoo/texlive-module-garrigues-2017.tar.xz mirror://gentoo/texlive-module-gmp-2017.tar.xz mirror://gentoo/texlive-module-hatching-2017.tar.xz mirror://gentoo/texlive-module-latexmp-2017.tar.xz mirror://gentoo/texlive-module-mcf2graph-2017.tar.xz mirror://gentoo/texlive-module-metago-2017.tar.xz mirror://gentoo/texlive-module-metaobj-2017.tar.xz mirror://gentoo/texlive-module-metaplot-2017.tar.xz mirror://gentoo/texlive-module-metapost-2017.tar.xz mirror://gentoo/texlive-module-metauml-2017.tar.xz mirror://gentoo/texlive-module-mfpic-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode-2017.tar.xz mirror://gentoo/texlive-module-mp3d-2017.tar.xz mirror://gentoo/texlive-module-mparrows-2017.tar.xz mirror://gentoo/texlive-module-mpattern-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics-2017.tar.xz mirror://gentoo/texlive-module-mptrees-2017.tar.xz mirror://gentoo/texlive-module-piechartmp-2017.tar.xz mirror://gentoo/texlive-module-repere-2017.tar.xz mirror://gentoo/texlive-module-roex-2017.tar.xz mirror://gentoo/texlive-module-roundrect-2017.tar.xz mirror://gentoo/texlive-module-shapes-2017.tar.xz mirror://gentoo/texlive-module-slideshow-2017.tar.xz mirror://gentoo/texlive-module-splines-2017.tar.xz mirror://gentoo/texlive-module-suanpan-2017.tar.xz mirror://gentoo/texlive-module-textpath-2017.tar.xz mirror://gentoo/texlive-module-threeddice-2017.tar.xz mirror://gentoo/texlive-module-collection-metapost-2017.tar.xz doc? ( mirror://gentoo/texlive-module-automata.doc-2017.tar.xz mirror://gentoo/texlive-module-bbcard.doc-2017.tar.xz mirror://gentoo/texlive-module-blockdraw_mp.doc-2017.tar.xz mirror://gentoo/texlive-module-bpolynomial.doc-2017.tar.xz mirror://gentoo/texlive-module-cmarrows.doc-2017.tar.xz mirror://gentoo/texlive-module-drv.doc-2017.tar.xz mirror://gentoo/texlive-module-dviincl.doc-2017.tar.xz mirror://gentoo/texlive-module-emp.doc-2017.tar.xz mirror://gentoo/texlive-module-epsincl.doc-2017.tar.xz mirror://gentoo/texlive-module-expressg.doc-2017.tar.xz mirror://gentoo/texlive-module-exteps.doc-2017.tar.xz mirror://gentoo/texlive-module-featpost.doc-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto.doc-2017.tar.xz mirror://gentoo/texlive-module-garrigues.doc-2017.tar.xz mirror://gentoo/texlive-module-gmp.doc-2017.tar.xz mirror://gentoo/texlive-module-hatching.doc-2017.tar.xz mirror://gentoo/texlive-module-latexmp.doc-2017.tar.xz mirror://gentoo/texlive-module-mcf2graph.doc-2017.tar.xz mirror://gentoo/texlive-module-metago.doc-2017.tar.xz mirror://gentoo/texlive-module-metaobj.doc-2017.tar.xz mirror://gentoo/texlive-module-metaplot.doc-2017.tar.xz mirror://gentoo/texlive-module-metapost.doc-2017.tar.xz mirror://gentoo/texlive-module-metauml.doc-2017.tar.xz mirror://gentoo/texlive-module-mfpic.doc-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode.doc-2017.tar.xz mirror://gentoo/texlive-module-mp3d.doc-2017.tar.xz mirror://gentoo/texlive-module-mparrows.doc-2017.tar.xz mirror://gentoo/texlive-module-mpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames.doc-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-mptrees.doc-2017.tar.xz mirror://gentoo/texlive-module-piechartmp.doc-2017.tar.xz mirror://gentoo/texlive-module-repere.doc-2017.tar.xz mirror://gentoo/texlive-module-roundrect.doc-2017.tar.xz mirror://gentoo/texlive-module-shapes.doc-2017.tar.xz mirror://gentoo/texlive-module-slideshow.doc-2017.tar.xz mirror://gentoo/texlive-module-splines.doc-2017.tar.xz mirror://gentoo/texlive-module-suanpan.doc-2017.tar.xz mirror://gentoo/texlive-module-textpath.doc-2017.tar.xz mirror://gentoo/texlive-module-threeddice.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-emp.source-2017.tar.xz mirror://gentoo/texlive-module-expressg.source-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto.source-2017.tar.xz mirror://gentoo/texlive-module-gmp.source-2017.tar.xz mirror://gentoo/texlive-module-mfpic.source-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode.source-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames.source-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-roex.source-2017.tar.xz mirror://gentoo/texlive-module-roundrect.source-2017.tar.xz mirror://gentoo/texlive-module-shapes.source-2017.tar.xz mirror://gentoo/texlive-module-splines.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=966db0e3b01f8ca6c37c1e9f1d738d91
+_md5_=e648f91150991e4752311cfbe1177df1
diff --git a/metadata/md5-cache/dev-texlive/texlive-music-2017 b/metadata/md5-cache/dev-texlive/texlive-music-2017
index 10963a39ff38..7337bfee862d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-music-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-music-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Music packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 MIT
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<app-text/texlive-core-2011 !<dev-texlive/texlive-pictures-2015 !<dev-texlive/texlive-genericextra-2015 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abc-2017.tar.xz mirror://gentoo/texlive-module-autosp-2017.tar.xz mirror://gentoo/texlive-module-bagpipe-2017.tar.xz mirror://gentoo/texlive-module-figbas-2017.tar.xz mirror://gentoo/texlive-module-gchords-2017.tar.xz mirror://gentoo/texlive-module-gregoriotex-2017.tar.xz mirror://gentoo/texlive-module-gtrcrd-2017.tar.xz mirror://gentoo/texlive-module-guitar-2017.tar.xz mirror://gentoo/texlive-module-guitarchordschemes-2017.tar.xz mirror://gentoo/texlive-module-harmony-2017.tar.xz mirror://gentoo/texlive-module-leadsheets-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs-2017.tar.xz mirror://gentoo/texlive-module-m-tx-2017.tar.xz mirror://gentoo/texlive-module-musixguit-2017.tar.xz mirror://gentoo/texlive-module-musixtex-2017.tar.xz mirror://gentoo/texlive-module-musixtex-fonts-2017.tar.xz mirror://gentoo/texlive-module-musixtnt-2017.tar.xz mirror://gentoo/texlive-module-piano-2017.tar.xz mirror://gentoo/texlive-module-pmx-2017.tar.xz mirror://gentoo/texlive-module-pmxchords-2017.tar.xz mirror://gentoo/texlive-module-songbook-2017.tar.xz mirror://gentoo/texlive-module-songs-2017.tar.xz mirror://gentoo/texlive-module-xpiano-2017.tar.xz mirror://gentoo/texlive-module-collection-music-2017.tar.xz doc? ( mirror://gentoo/texlive-module-abc.doc-2017.tar.xz mirror://gentoo/texlive-module-autosp.doc-2017.tar.xz mirror://gentoo/texlive-module-bagpipe.doc-2017.tar.xz mirror://gentoo/texlive-module-figbas.doc-2017.tar.xz mirror://gentoo/texlive-module-gchords.doc-2017.tar.xz mirror://gentoo/texlive-module-gregoriotex.doc-2017.tar.xz mirror://gentoo/texlive-module-gtrcrd.doc-2017.tar.xz mirror://gentoo/texlive-module-guitar.doc-2017.tar.xz mirror://gentoo/texlive-module-guitarchordschemes.doc-2017.tar.xz mirror://gentoo/texlive-module-harmony.doc-2017.tar.xz mirror://gentoo/texlive-module-leadsheets.doc-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs.doc-2017.tar.xz mirror://gentoo/texlive-module-m-tx.doc-2017.tar.xz mirror://gentoo/texlive-module-musixguit.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtex.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtnt.doc-2017.tar.xz mirror://gentoo/texlive-module-piano.doc-2017.tar.xz mirror://gentoo/texlive-module-pmx.doc-2017.tar.xz mirror://gentoo/texlive-module-pmxchords.doc-2017.tar.xz mirror://gentoo/texlive-module-songbook.doc-2017.tar.xz mirror://gentoo/texlive-module-songs.doc-2017.tar.xz mirror://gentoo/texlive-module-xpiano.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-abc.source-2017.tar.xz mirror://gentoo/texlive-module-guitar.source-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs.source-2017.tar.xz mirror://gentoo/texlive-module-musixtex.source-2017.tar.xz mirror://gentoo/texlive-module-songbook.source-2017.tar.xz mirror://gentoo/texlive-module-songs.source-2017.tar.xz mirror://gentoo/texlive-module-xpiano.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5881ec49918051c53eca7c147aab1506
+_md5_=82562bb7d52b3200a82f4c8317e7c058
diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2017 b/metadata/md5-cache/dev-texlive/texlive-pictures-2017
index ec9a1943d736..7072bb639eec 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pictures-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-pictures-2017
@@ -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 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=Apache-2.0 BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-latexextra-2009 !<dev-texlive/texlive-texinfo-2009 >=dev-tex/pgf-3.0.1 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aobs-tikz-2017.tar.xz mirror://gentoo/texlive-module-askmaps-2017.tar.xz mirror://gentoo/texlive-module-asyfig-2017.tar.xz mirror://gentoo/texlive-module-asypictureb-2017.tar.xz mirror://gentoo/texlive-module-autoarea-2017.tar.xz mirror://gentoo/texlive-module-bardiag-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch-2017.tar.xz mirror://gentoo/texlive-module-binarytree-2017.tar.xz mirror://gentoo/texlive-module-blochsphere-2017.tar.xz mirror://gentoo/texlive-module-bloques-2017.tar.xz mirror://gentoo/texlive-module-blox-2017.tar.xz mirror://gentoo/texlive-module-bodegraph-2017.tar.xz mirror://gentoo/texlive-module-bondgraph-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs-2017.tar.xz mirror://gentoo/texlive-module-braids-2017.tar.xz mirror://gentoo/texlive-module-bxeepic-2017.tar.xz mirror://gentoo/texlive-module-cachepic-2017.tar.xz mirror://gentoo/texlive-module-callouts-2017.tar.xz mirror://gentoo/texlive-module-celtic-2017.tar.xz mirror://gentoo/texlive-module-chemfig-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics-2017.tar.xz mirror://gentoo/texlive-module-circuitikz-2017.tar.xz mirror://gentoo/texlive-module-curve-2017.tar.xz mirror://gentoo/texlive-module-curve2e-2017.tar.xz mirror://gentoo/texlive-module-curves-2017.tar.xz mirror://gentoo/texlive-module-dcpic-2017.tar.xz mirror://gentoo/texlive-module-diagmac2-2017.tar.xz mirror://gentoo/texlive-module-doc-pictex-2017.tar.xz mirror://gentoo/texlive-module-dottex-2017.tar.xz mirror://gentoo/texlive-module-dratex-2017.tar.xz mirror://gentoo/texlive-module-drs-2017.tar.xz mirror://gentoo/texlive-module-duotenzor-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw-2017.tar.xz mirror://gentoo/texlive-module-eepic-2017.tar.xz mirror://gentoo/texlive-module-ellipse-2017.tar.xz mirror://gentoo/texlive-module-epspdfconversion-2017.tar.xz mirror://gentoo/texlive-module-esk-2017.tar.xz mirror://gentoo/texlive-module-fast-diagram-2017.tar.xz mirror://gentoo/texlive-module-fig4latex-2017.tar.xz mirror://gentoo/texlive-module-fitbox-2017.tar.xz mirror://gentoo/texlive-module-flowchart-2017.tar.xz mirror://gentoo/texlive-module-forest-2017.tar.xz mirror://gentoo/texlive-module-genealogytree-2017.tar.xz mirror://gentoo/texlive-module-getmap-2017.tar.xz mirror://gentoo/texlive-module-gincltex-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex-2017.tar.xz mirror://gentoo/texlive-module-gradientframe-2017.tar.xz mirror://gentoo/texlive-module-grafcet-2017.tar.xz mirror://gentoo/texlive-module-graphviz-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees-2017.tar.xz mirror://gentoo/texlive-module-harveyballs-2017.tar.xz mirror://gentoo/texlive-module-here-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz-2017.tar.xz mirror://gentoo/texlive-module-hobby-2017.tar.xz mirror://gentoo/texlive-module-hvfloat-2017.tar.xz mirror://gentoo/texlive-module-knitting-2017.tar.xz mirror://gentoo/texlive-module-knittingpattern-2017.tar.xz mirror://gentoo/texlive-module-ladder-2017.tar.xz mirror://gentoo/texlive-module-lapdf-2017.tar.xz mirror://gentoo/texlive-module-latex-make-2017.tar.xz mirror://gentoo/texlive-module-lpic-2017.tar.xz mirror://gentoo/texlive-module-lroundrect-2017.tar.xz mirror://gentoo/texlive-module-luamesh-2017.tar.xz mirror://gentoo/texlive-module-makeshape-2017.tar.xz mirror://gentoo/texlive-module-mathspic-2017.tar.xz mirror://gentoo/texlive-module-miniplot-2017.tar.xz mirror://gentoo/texlive-module-mkpic-2017.tar.xz mirror://gentoo/texlive-module-modiagram-2017.tar.xz mirror://gentoo/texlive-module-neuralnetwork-2017.tar.xz mirror://gentoo/texlive-module-numericplots-2017.tar.xz mirror://gentoo/texlive-module-pb-diagram-2017.tar.xz mirror://gentoo/texlive-module-petri-nets-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur-2017.tar.xz mirror://gentoo/texlive-module-pgf-soroban-2017.tar.xz mirror://gentoo/texlive-module-pgf-spectra-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlcd-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlsd-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt-2017.tar.xz mirror://gentoo/texlive-module-pgfkeyx-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio-2017.tar.xz mirror://gentoo/texlive-module-pgfopts-2017.tar.xz mirror://gentoo/texlive-module-pgfornament-2017.tar.xz mirror://gentoo/texlive-module-pgfplots-2017.tar.xz mirror://gentoo/texlive-module-picinpar-2017.tar.xz mirror://gentoo/texlive-module-pict2e-2017.tar.xz mirror://gentoo/texlive-module-pictex-2017.tar.xz mirror://gentoo/texlive-module-pictex2-2017.tar.xz mirror://gentoo/texlive-module-pinlabel-2017.tar.xz mirror://gentoo/texlive-module-pmgraph-2017.tar.xz mirror://gentoo/texlive-module-prerex-2017.tar.xz mirror://gentoo/texlive-module-productbox-2017.tar.xz mirror://gentoo/texlive-module-pxpgfmark-2017.tar.xz mirror://gentoo/texlive-module-qcircuit-2017.tar.xz mirror://gentoo/texlive-module-qrcode-2017.tar.xz mirror://gentoo/texlive-module-randbild-2017.tar.xz mirror://gentoo/texlive-module-randomwalk-2017.tar.xz mirror://gentoo/texlive-module-reotex-2017.tar.xz mirror://gentoo/texlive-module-rviewport-2017.tar.xz mirror://gentoo/texlive-module-sa-tikz-2017.tar.xz mirror://gentoo/texlive-module-schemabloc-2017.tar.xz mirror://gentoo/texlive-module-scsnowman-2017.tar.xz mirror://gentoo/texlive-module-scratch-2017.tar.xz mirror://gentoo/texlive-module-setdeck-2017.tar.xz mirror://gentoo/texlive-module-signchart-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram-2017.tar.xz mirror://gentoo/texlive-module-spath3-2017.tar.xz mirror://gentoo/texlive-module-swimgraf-2017.tar.xz mirror://gentoo/texlive-module-table-fct-2017.tar.xz mirror://gentoo/texlive-module-texdraw-2017.tar.xz mirror://gentoo/texlive-module-ticollege-2017.tar.xz mirror://gentoo/texlive-module-tipfr-2017.tar.xz mirror://gentoo/texlive-module-tikz-3dplot-2017.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet-2017.tar.xz mirror://gentoo/texlive-module-tikz-cd-2017.tar.xz mirror://gentoo/texlive-module-tikz-dependency-2017.tar.xz mirror://gentoo/texlive-module-tikz-dimline-2017.tar.xz mirror://gentoo/texlive-module-tikz-feynman-2017.tar.xz mirror://gentoo/texlive-module-tikz-inet-2017.tar.xz mirror://gentoo/texlive-module-tikz-kalender-2017.tar.xz mirror://gentoo/texlive-module-tikz-opm-2017.tar.xz mirror://gentoo/texlive-module-tikz-optics-2017.tar.xz mirror://gentoo/texlive-module-tikz-page-2017.tar.xz mirror://gentoo/texlive-module-tikz-palattice-2017.tar.xz mirror://gentoo/texlive-module-tikz-qtree-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude-2017.tar.xz mirror://gentoo/texlive-module-tikzmark-2017.tar.xz mirror://gentoo/texlive-module-tikzorbital-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile-2017.tar.xz mirror://gentoo/texlive-module-tikzpeople-2017.tar.xz mirror://gentoo/texlive-module-tikzposter-2017.tar.xz mirror://gentoo/texlive-module-tikzscale-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols-2017.tar.xz mirror://gentoo/texlive-module-timing-diagrams-2017.tar.xz mirror://gentoo/texlive-module-tqft-2017.tar.xz mirror://gentoo/texlive-module-tkz-base-2017.tar.xz mirror://gentoo/texlive-module-tkz-berge-2017.tar.xz mirror://gentoo/texlive-module-tkz-doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-euclide-2017.tar.xz mirror://gentoo/texlive-module-tkz-fct-2017.tar.xz mirror://gentoo/texlive-module-tkz-graph-2017.tar.xz mirror://gentoo/texlive-module-tkz-kiviat-2017.tar.xz mirror://gentoo/texlive-module-tkz-linknodes-2017.tar.xz mirror://gentoo/texlive-module-tkz-orm-2017.tar.xz mirror://gentoo/texlive-module-tkz-tab-2017.tar.xz mirror://gentoo/texlive-module-tsemlines-2017.tar.xz mirror://gentoo/texlive-module-tufte-latex-2017.tar.xz mirror://gentoo/texlive-module-venndiagram-2017.tar.xz mirror://gentoo/texlive-module-visualpstricks-2017.tar.xz mirror://gentoo/texlive-module-xpicture-2017.tar.xz mirror://gentoo/texlive-module-xypic-2017.tar.xz mirror://gentoo/texlive-module-collection-pictures-2017.tar.xz doc? ( mirror://gentoo/texlive-module-aobs-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-askmaps.doc-2017.tar.xz mirror://gentoo/texlive-module-asyfig.doc-2017.tar.xz mirror://gentoo/texlive-module-asypictureb.doc-2017.tar.xz mirror://gentoo/texlive-module-autoarea.doc-2017.tar.xz mirror://gentoo/texlive-module-bardiag.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch.doc-2017.tar.xz mirror://gentoo/texlive-module-binarytree.doc-2017.tar.xz mirror://gentoo/texlive-module-blochsphere.doc-2017.tar.xz mirror://gentoo/texlive-module-bloques.doc-2017.tar.xz mirror://gentoo/texlive-module-blox.doc-2017.tar.xz mirror://gentoo/texlive-module-bodegraph.doc-2017.tar.xz mirror://gentoo/texlive-module-bondgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs.doc-2017.tar.xz mirror://gentoo/texlive-module-braids.doc-2017.tar.xz mirror://gentoo/texlive-module-bxeepic.doc-2017.tar.xz mirror://gentoo/texlive-module-cachepic.doc-2017.tar.xz mirror://gentoo/texlive-module-callouts.doc-2017.tar.xz mirror://gentoo/texlive-module-celtic.doc-2017.tar.xz mirror://gentoo/texlive-module-chemfig.doc-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-circuitikz.doc-2017.tar.xz mirror://gentoo/texlive-module-curve.doc-2017.tar.xz mirror://gentoo/texlive-module-curve2e.doc-2017.tar.xz mirror://gentoo/texlive-module-curves.doc-2017.tar.xz mirror://gentoo/texlive-module-dcpic.doc-2017.tar.xz mirror://gentoo/texlive-module-diagmac2.doc-2017.tar.xz mirror://gentoo/texlive-module-doc-pictex.doc-2017.tar.xz mirror://gentoo/texlive-module-dottex.doc-2017.tar.xz mirror://gentoo/texlive-module-dratex.doc-2017.tar.xz mirror://gentoo/texlive-module-drs.doc-2017.tar.xz mirror://gentoo/texlive-module-duotenzor.doc-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw.doc-2017.tar.xz mirror://gentoo/texlive-module-eepic.doc-2017.tar.xz mirror://gentoo/texlive-module-ellipse.doc-2017.tar.xz mirror://gentoo/texlive-module-epspdfconversion.doc-2017.tar.xz mirror://gentoo/texlive-module-esk.doc-2017.tar.xz mirror://gentoo/texlive-module-fast-diagram.doc-2017.tar.xz mirror://gentoo/texlive-module-fig4latex.doc-2017.tar.xz mirror://gentoo/texlive-module-fitbox.doc-2017.tar.xz mirror://gentoo/texlive-module-flowchart.doc-2017.tar.xz mirror://gentoo/texlive-module-forest.doc-2017.tar.xz mirror://gentoo/texlive-module-genealogytree.doc-2017.tar.xz mirror://gentoo/texlive-module-getmap.doc-2017.tar.xz mirror://gentoo/texlive-module-gincltex.doc-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex.doc-2017.tar.xz mirror://gentoo/texlive-module-gradientframe.doc-2017.tar.xz mirror://gentoo/texlive-module-grafcet.doc-2017.tar.xz mirror://gentoo/texlive-module-graphviz.doc-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.doc-2017.tar.xz mirror://gentoo/texlive-module-harveyballs.doc-2017.tar.xz mirror://gentoo/texlive-module-here.doc-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-hobby.doc-2017.tar.xz mirror://gentoo/texlive-module-hvfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-knitting.doc-2017.tar.xz mirror://gentoo/texlive-module-knittingpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-ladder.doc-2017.tar.xz mirror://gentoo/texlive-module-lapdf.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-make.doc-2017.tar.xz mirror://gentoo/texlive-module-lpic.doc-2017.tar.xz mirror://gentoo/texlive-module-lroundrect.doc-2017.tar.xz mirror://gentoo/texlive-module-luamesh.doc-2017.tar.xz mirror://gentoo/texlive-module-makeshape.doc-2017.tar.xz mirror://gentoo/texlive-module-mathspic.doc-2017.tar.xz mirror://gentoo/texlive-module-miniplot.doc-2017.tar.xz mirror://gentoo/texlive-module-mkpic.doc-2017.tar.xz mirror://gentoo/texlive-module-modiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-neuralnetwork.doc-2017.tar.xz mirror://gentoo/texlive-module-numericplots.doc-2017.tar.xz mirror://gentoo/texlive-module-pb-diagram.doc-2017.tar.xz mirror://gentoo/texlive-module-petri-nets.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-soroban.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-spectra.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlcd.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlsd.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfkeyx.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfopts.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfornament.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfplots.doc-2017.tar.xz mirror://gentoo/texlive-module-picinpar.doc-2017.tar.xz mirror://gentoo/texlive-module-pict2e.doc-2017.tar.xz mirror://gentoo/texlive-module-pictex.doc-2017.tar.xz mirror://gentoo/texlive-module-pinlabel.doc-2017.tar.xz mirror://gentoo/texlive-module-pmgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-prerex.doc-2017.tar.xz mirror://gentoo/texlive-module-productbox.doc-2017.tar.xz mirror://gentoo/texlive-module-pxpgfmark.doc-2017.tar.xz mirror://gentoo/texlive-module-qcircuit.doc-2017.tar.xz mirror://gentoo/texlive-module-qrcode.doc-2017.tar.xz mirror://gentoo/texlive-module-randbild.doc-2017.tar.xz mirror://gentoo/texlive-module-randomwalk.doc-2017.tar.xz mirror://gentoo/texlive-module-reotex.doc-2017.tar.xz mirror://gentoo/texlive-module-rviewport.doc-2017.tar.xz mirror://gentoo/texlive-module-sa-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-schemabloc.doc-2017.tar.xz mirror://gentoo/texlive-module-scsnowman.doc-2017.tar.xz mirror://gentoo/texlive-module-scratch.doc-2017.tar.xz mirror://gentoo/texlive-module-setdeck.doc-2017.tar.xz mirror://gentoo/texlive-module-signchart.doc-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-spath3.doc-2017.tar.xz mirror://gentoo/texlive-module-swimgraf.doc-2017.tar.xz mirror://gentoo/texlive-module-table-fct.doc-2017.tar.xz mirror://gentoo/texlive-module-texdraw.doc-2017.tar.xz mirror://gentoo/texlive-module-ticollege.doc-2017.tar.xz mirror://gentoo/texlive-module-tipfr.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-3dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-cd.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-dependency.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-dimline.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-feynman.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-inet.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-kalender.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-opm.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-optics.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-page.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-palattice.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzmark.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzorbital.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpeople.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzposter.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzscale.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-timing-diagrams.doc-2017.tar.xz mirror://gentoo/texlive-module-tqft.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-base.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-berge.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-euclide.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-fct.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-graph.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-kiviat.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-linknodes.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-orm.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-tab.doc-2017.tar.xz mirror://gentoo/texlive-module-tufte-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-venndiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-visualpstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-xpicture.doc-2017.tar.xz mirror://gentoo/texlive-module-xypic.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-aobs-tikz.source-2017.tar.xz mirror://gentoo/texlive-module-asyfig.source-2017.tar.xz mirror://gentoo/texlive-module-asypictureb.source-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch.source-2017.tar.xz mirror://gentoo/texlive-module-binarytree.source-2017.tar.xz mirror://gentoo/texlive-module-blochsphere.source-2017.tar.xz mirror://gentoo/texlive-module-blox.source-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs.source-2017.tar.xz mirror://gentoo/texlive-module-braids.source-2017.tar.xz mirror://gentoo/texlive-module-celtic.source-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-curve.source-2017.tar.xz mirror://gentoo/texlive-module-curve2e.source-2017.tar.xz mirror://gentoo/texlive-module-curves.source-2017.tar.xz mirror://gentoo/texlive-module-dottex.source-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw.source-2017.tar.xz mirror://gentoo/texlive-module-ellipse.source-2017.tar.xz mirror://gentoo/texlive-module-esk.source-2017.tar.xz mirror://gentoo/texlive-module-fitbox.source-2017.tar.xz mirror://gentoo/texlive-module-flowchart.source-2017.tar.xz mirror://gentoo/texlive-module-forest.source-2017.tar.xz mirror://gentoo/texlive-module-gincltex.source-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex.source-2017.tar.xz mirror://gentoo/texlive-module-gradientframe.source-2017.tar.xz mirror://gentoo/texlive-module-graphviz.source-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.source-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz.source-2017.tar.xz mirror://gentoo/texlive-module-hobby.source-2017.tar.xz mirror://gentoo/texlive-module-latex-make.source-2017.tar.xz mirror://gentoo/texlive-module-lroundrect.source-2017.tar.xz mirror://gentoo/texlive-module-makeshape.source-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur.source-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt.source-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio.source-2017.tar.xz mirror://gentoo/texlive-module-pgfopts.source-2017.tar.xz mirror://gentoo/texlive-module-pgfplots.source-2017.tar.xz mirror://gentoo/texlive-module-pict2e.source-2017.tar.xz mirror://gentoo/texlive-module-productbox.source-2017.tar.xz mirror://gentoo/texlive-module-qrcode.source-2017.tar.xz mirror://gentoo/texlive-module-randbild.source-2017.tar.xz mirror://gentoo/texlive-module-randomwalk.source-2017.tar.xz mirror://gentoo/texlive-module-rviewport.source-2017.tar.xz mirror://gentoo/texlive-module-signchart.source-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram.source-2017.tar.xz mirror://gentoo/texlive-module-spath3.source-2017.tar.xz mirror://gentoo/texlive-module-tikz-page.source-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing.source-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude.source-2017.tar.xz mirror://gentoo/texlive-module-tikzmark.source-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.source-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile.source-2017.tar.xz mirror://gentoo/texlive-module-tikzposter.source-2017.tar.xz mirror://gentoo/texlive-module-tikzscale.source-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-tqft.source-2017.tar.xz mirror://gentoo/texlive-module-venndiagram.source-2017.tar.xz mirror://gentoo/texlive-module-xpicture.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a7a9108c8eb183330d375f7b868489c
+_md5_=fd2f50052c279355e04823c1a0116614
diff --git a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017 b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
index 4a597497704c..c6cf214a6ab4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Plain (La)TeX packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-langvietnamese-2009 !dev-texlive/texlive-texinfo !=dev-texlive/texlive-basic-2007* !<dev-texlive/texlive-texinfo-2009 !<dev-texlive/texlive-latexextra-2010 !dev-texlive/texlive-genericextra !dev-texlive/texlive-genericrecommended !dev-texlive/texlive-plainextra >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abbr-2017.tar.xz mirror://gentoo/texlive-module-abstyles-2017.tar.xz mirror://gentoo/texlive-module-apnum-2017.tar.xz mirror://gentoo/texlive-module-autoaligne-2017.tar.xz mirror://gentoo/texlive-module-barr-2017.tar.xz mirror://gentoo/texlive-module-bitelist-2017.tar.xz mirror://gentoo/texlive-module-borceux-2017.tar.xz mirror://gentoo/texlive-module-c-pascal-2017.tar.xz mirror://gentoo/texlive-module-catcodes-2017.tar.xz mirror://gentoo/texlive-module-chronosys-2017.tar.xz mirror://gentoo/texlive-module-colorsep-2017.tar.xz mirror://gentoo/texlive-module-dinat-2017.tar.xz mirror://gentoo/texlive-module-dirtree-2017.tar.xz mirror://gentoo/texlive-module-docbytex-2017.tar.xz mirror://gentoo/texlive-module-dowith-2017.tar.xz mirror://gentoo/texlive-module-eijkhout-2017.tar.xz mirror://gentoo/texlive-module-encxvlna-2017.tar.xz mirror://gentoo/texlive-module-epigram-2017.tar.xz mirror://gentoo/texlive-module-epsf-2017.tar.xz mirror://gentoo/texlive-module-epsf-dvipdfmx-2017.tar.xz mirror://gentoo/texlive-module-fenixpar-2017.tar.xz mirror://gentoo/texlive-module-figflow-2017.tar.xz mirror://gentoo/texlive-module-fixpdfmag-2017.tar.xz mirror://gentoo/texlive-module-fltpoint-2017.tar.xz mirror://gentoo/texlive-module-fntproof-2017.tar.xz mirror://gentoo/texlive-module-font-change-2017.tar.xz mirror://gentoo/texlive-module-fontch-2017.tar.xz mirror://gentoo/texlive-module-fontname-2017.tar.xz mirror://gentoo/texlive-module-gates-2017.tar.xz mirror://gentoo/texlive-module-genmisc-2017.tar.xz mirror://gentoo/texlive-module-getoptk-2017.tar.xz mirror://gentoo/texlive-module-gfnotation-2017.tar.xz mirror://gentoo/texlive-module-gobble-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln-2017.tar.xz mirror://gentoo/texlive-module-gtl-2017.tar.xz mirror://gentoo/texlive-module-hlist-2017.tar.xz mirror://gentoo/texlive-module-hyplain-2017.tar.xz mirror://gentoo/texlive-module-ifetex-2017.tar.xz mirror://gentoo/texlive-module-iftex-2017.tar.xz mirror://gentoo/texlive-module-insbox-2017.tar.xz mirror://gentoo/texlive-module-js-misc-2017.tar.xz mirror://gentoo/texlive-module-kastrup-2017.tar.xz mirror://gentoo/texlive-module-lambda-lists-2017.tar.xz mirror://gentoo/texlive-module-langcode-2017.tar.xz mirror://gentoo/texlive-module-lecturer-2017.tar.xz mirror://gentoo/texlive-module-librarian-2017.tar.xz mirror://gentoo/texlive-module-listofitems-2017.tar.xz mirror://gentoo/texlive-module-mathdots-2017.tar.xz mirror://gentoo/texlive-module-metatex-2017.tar.xz mirror://gentoo/texlive-module-midnight-2017.tar.xz mirror://gentoo/texlive-module-mkpattern-2017.tar.xz mirror://gentoo/texlive-module-multido-2017.tar.xz mirror://gentoo/texlive-module-navigator-2017.tar.xz mirror://gentoo/texlive-module-newsletr-2017.tar.xz mirror://gentoo/texlive-module-ofs-2017.tar.xz mirror://gentoo/texlive-module-olsak-misc-2017.tar.xz mirror://gentoo/texlive-module-path-2017.tar.xz mirror://gentoo/texlive-module-pdf-trans-2017.tar.xz mirror://gentoo/texlive-module-pitex-2017.tar.xz mirror://gentoo/texlive-module-placeins-plain-2017.tar.xz mirror://gentoo/texlive-module-plainpkg-2017.tar.xz mirror://gentoo/texlive-module-plipsum-2017.tar.xz mirror://gentoo/texlive-module-plnfss-2017.tar.xz mirror://gentoo/texlive-module-plstmary-2017.tar.xz mirror://gentoo/texlive-module-present-2017.tar.xz mirror://gentoo/texlive-module-randomlist-2017.tar.xz mirror://gentoo/texlive-module-resumemac-2017.tar.xz mirror://gentoo/texlive-module-schemata-2017.tar.xz mirror://gentoo/texlive-module-shade-2017.tar.xz mirror://gentoo/texlive-module-systeme-2017.tar.xz mirror://gentoo/texlive-module-tabto-generic-2017.tar.xz mirror://gentoo/texlive-module-termmenu-2017.tar.xz mirror://gentoo/texlive-module-tex-ps-2017.tar.xz mirror://gentoo/texlive-module-tex4ht-2017.tar.xz mirror://gentoo/texlive-module-texapi-2017.tar.xz mirror://gentoo/texlive-module-texinfo-2017.tar.xz mirror://gentoo/texlive-module-timetable-2017.tar.xz mirror://gentoo/texlive-module-tracklang-2017.tar.xz mirror://gentoo/texlive-module-treetex-2017.tar.xz mirror://gentoo/texlive-module-trigonometry-2017.tar.xz mirror://gentoo/texlive-module-ulem-2017.tar.xz mirror://gentoo/texlive-module-upca-2017.tar.xz mirror://gentoo/texlive-module-varisize-2017.tar.xz mirror://gentoo/texlive-module-xii-2017.tar.xz mirror://gentoo/texlive-module-xlop-2017.tar.xz mirror://gentoo/texlive-module-yax-2017.tar.xz mirror://gentoo/texlive-module-collection-plaingeneric-2017.tar.xz doc? ( mirror://gentoo/texlive-module-abbr.doc-2017.tar.xz mirror://gentoo/texlive-module-abstyles.doc-2017.tar.xz mirror://gentoo/texlive-module-apnum.doc-2017.tar.xz mirror://gentoo/texlive-module-autoaligne.doc-2017.tar.xz mirror://gentoo/texlive-module-barr.doc-2017.tar.xz mirror://gentoo/texlive-module-bitelist.doc-2017.tar.xz mirror://gentoo/texlive-module-borceux.doc-2017.tar.xz mirror://gentoo/texlive-module-c-pascal.doc-2017.tar.xz mirror://gentoo/texlive-module-catcodes.doc-2017.tar.xz mirror://gentoo/texlive-module-chronosys.doc-2017.tar.xz mirror://gentoo/texlive-module-dinat.doc-2017.tar.xz mirror://gentoo/texlive-module-dirtree.doc-2017.tar.xz mirror://gentoo/texlive-module-docbytex.doc-2017.tar.xz mirror://gentoo/texlive-module-dowith.doc-2017.tar.xz mirror://gentoo/texlive-module-encxvlna.doc-2017.tar.xz mirror://gentoo/texlive-module-epsf.doc-2017.tar.xz mirror://gentoo/texlive-module-epsf-dvipdfmx.doc-2017.tar.xz mirror://gentoo/texlive-module-fenixpar.doc-2017.tar.xz mirror://gentoo/texlive-module-figflow.doc-2017.tar.xz mirror://gentoo/texlive-module-fltpoint.doc-2017.tar.xz mirror://gentoo/texlive-module-fntproof.doc-2017.tar.xz mirror://gentoo/texlive-module-font-change.doc-2017.tar.xz mirror://gentoo/texlive-module-fontch.doc-2017.tar.xz mirror://gentoo/texlive-module-fontname.doc-2017.tar.xz mirror://gentoo/texlive-module-gates.doc-2017.tar.xz mirror://gentoo/texlive-module-getoptk.doc-2017.tar.xz mirror://gentoo/texlive-module-gfnotation.doc-2017.tar.xz mirror://gentoo/texlive-module-gobble.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln.doc-2017.tar.xz mirror://gentoo/texlive-module-gtl.doc-2017.tar.xz mirror://gentoo/texlive-module-hlist.doc-2017.tar.xz mirror://gentoo/texlive-module-hyplain.doc-2017.tar.xz mirror://gentoo/texlive-module-ifetex.doc-2017.tar.xz mirror://gentoo/texlive-module-iftex.doc-2017.tar.xz mirror://gentoo/texlive-module-insbox.doc-2017.tar.xz mirror://gentoo/texlive-module-js-misc.doc-2017.tar.xz mirror://gentoo/texlive-module-kastrup.doc-2017.tar.xz mirror://gentoo/texlive-module-lambda-lists.doc-2017.tar.xz mirror://gentoo/texlive-module-langcode.doc-2017.tar.xz mirror://gentoo/texlive-module-lecturer.doc-2017.tar.xz mirror://gentoo/texlive-module-librarian.doc-2017.tar.xz mirror://gentoo/texlive-module-listofitems.doc-2017.tar.xz mirror://gentoo/texlive-module-mathdots.doc-2017.tar.xz mirror://gentoo/texlive-module-metatex.doc-2017.tar.xz mirror://gentoo/texlive-module-midnight.doc-2017.tar.xz mirror://gentoo/texlive-module-mkpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-multido.doc-2017.tar.xz mirror://gentoo/texlive-module-navigator.doc-2017.tar.xz mirror://gentoo/texlive-module-newsletr.doc-2017.tar.xz mirror://gentoo/texlive-module-ofs.doc-2017.tar.xz mirror://gentoo/texlive-module-olsak-misc.doc-2017.tar.xz mirror://gentoo/texlive-module-path.doc-2017.tar.xz mirror://gentoo/texlive-module-pdf-trans.doc-2017.tar.xz mirror://gentoo/texlive-module-pitex.doc-2017.tar.xz mirror://gentoo/texlive-module-plainpkg.doc-2017.tar.xz mirror://gentoo/texlive-module-plipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-plnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-plstmary.doc-2017.tar.xz mirror://gentoo/texlive-module-present.doc-2017.tar.xz mirror://gentoo/texlive-module-randomlist.doc-2017.tar.xz mirror://gentoo/texlive-module-resumemac.doc-2017.tar.xz mirror://gentoo/texlive-module-schemata.doc-2017.tar.xz mirror://gentoo/texlive-module-shade.doc-2017.tar.xz mirror://gentoo/texlive-module-systeme.doc-2017.tar.xz mirror://gentoo/texlive-module-termmenu.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-texapi.doc-2017.tar.xz mirror://gentoo/texlive-module-tracklang.doc-2017.tar.xz mirror://gentoo/texlive-module-treetex.doc-2017.tar.xz mirror://gentoo/texlive-module-trigonometry.doc-2017.tar.xz mirror://gentoo/texlive-module-ulem.doc-2017.tar.xz mirror://gentoo/texlive-module-upca.doc-2017.tar.xz mirror://gentoo/texlive-module-varisize.doc-2017.tar.xz mirror://gentoo/texlive-module-xii.doc-2017.tar.xz mirror://gentoo/texlive-module-xlop.doc-2017.tar.xz mirror://gentoo/texlive-module-yax.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-bitelist.source-2017.tar.xz mirror://gentoo/texlive-module-catcodes.source-2017.tar.xz mirror://gentoo/texlive-module-dirtree.source-2017.tar.xz mirror://gentoo/texlive-module-dowith.source-2017.tar.xz mirror://gentoo/texlive-module-fltpoint.source-2017.tar.xz mirror://gentoo/texlive-module-gobble.source-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln.source-2017.tar.xz mirror://gentoo/texlive-module-gtl.source-2017.tar.xz mirror://gentoo/texlive-module-ifetex.source-2017.tar.xz mirror://gentoo/texlive-module-kastrup.source-2017.tar.xz mirror://gentoo/texlive-module-langcode.source-2017.tar.xz mirror://gentoo/texlive-module-mathdots.source-2017.tar.xz mirror://gentoo/texlive-module-multido.source-2017.tar.xz mirror://gentoo/texlive-module-plainpkg.source-2017.tar.xz mirror://gentoo/texlive-module-randomlist.source-2017.tar.xz mirror://gentoo/texlive-module-schemata.source-2017.tar.xz mirror://gentoo/texlive-module-termmenu.source-2017.tar.xz mirror://gentoo/texlive-module-tracklang.source-2017.tar.xz mirror://gentoo/texlive-module-xlop.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=75e7de5a92bf826a4bdbd567fc9e33e8
+_md5_=26de9b0042813d6ccdd74a2c42687f17
diff --git a/metadata/md5-cache/dev-texlive/texlive-pstricks-2017 b/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
index a3ef488fde7b..4bf2f3b4527f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive PSTricks
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LGPL-2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-plaingeneric-2017 dev-tex/pgf >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-auto-pst-pdf-2017.tar.xz mirror://gentoo/texlive-module-bclogo-2017.tar.xz mirror://gentoo/texlive-module-dsptricks-2017.tar.xz mirror://gentoo/texlive-module-makeplot-2017.tar.xz mirror://gentoo/texlive-module-pdftricks-2017.tar.xz mirror://gentoo/texlive-module-pdftricks2-2017.tar.xz mirror://gentoo/texlive-module-pedigree-perl-2017.tar.xz mirror://gentoo/texlive-module-psbao-2017.tar.xz mirror://gentoo/texlive-module-pst-2dplot-2017.tar.xz mirror://gentoo/texlive-module-pst-3d-2017.tar.xz mirror://gentoo/texlive-module-pst-3dplot-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos-2017.tar.xz mirror://gentoo/texlive-module-pst-arrow-2017.tar.xz mirror://gentoo/texlive-module-pst-am-2017.tar.xz mirror://gentoo/texlive-module-pst-asr-2017.tar.xz mirror://gentoo/texlive-module-pst-bar-2017.tar.xz mirror://gentoo/texlive-module-pst-barcode-2017.tar.xz mirror://gentoo/texlive-module-pst-bezier-2017.tar.xz mirror://gentoo/texlive-module-pst-blur-2017.tar.xz mirror://gentoo/texlive-module-pst-bspline-2017.tar.xz mirror://gentoo/texlive-module-pst-calendar-2017.tar.xz mirror://gentoo/texlive-module-pst-cie-2017.tar.xz mirror://gentoo/texlive-module-pst-circ-2017.tar.xz mirror://gentoo/texlive-module-pst-coil-2017.tar.xz mirror://gentoo/texlive-module-pst-cox-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield-2017.tar.xz mirror://gentoo/texlive-module-pst-eps-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-2017.tar.xz mirror://gentoo/texlive-module-pst-exa-2017.tar.xz mirror://gentoo/texlive-module-pst-fill-2017.tar.xz mirror://gentoo/texlive-module-pst-fit-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d-2017.tar.xz mirror://gentoo/texlive-module-pst-fractal-2017.tar.xz mirror://gentoo/texlive-module-pst-fun-2017.tar.xz mirror://gentoo/texlive-module-pst-func-2017.tar.xz mirror://gentoo/texlive-module-pst-gantt-2017.tar.xz mirror://gentoo/texlive-module-pst-geo-2017.tar.xz mirror://gentoo/texlive-module-pst-ghsb-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d-2017.tar.xz mirror://gentoo/texlive-module-pst-grad-2017.tar.xz mirror://gentoo/texlive-module-pst-graphicx-2017.tar.xz mirror://gentoo/texlive-module-pst-infixplot-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect-2017.tar.xz mirror://gentoo/texlive-module-pst-jtree-2017.tar.xz mirror://gentoo/texlive-module-pst-knot-2017.tar.xz mirror://gentoo/texlive-module-pst-labo-2017.tar.xz mirror://gentoo/texlive-module-pst-layout-2017.tar.xz mirror://gentoo/texlive-module-pst-lens-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield-2017.tar.xz mirror://gentoo/texlive-module-pst-math-2017.tar.xz mirror://gentoo/texlive-module-pst-mirror-2017.tar.xz mirror://gentoo/texlive-module-pst-node-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d-2017.tar.xz mirror://gentoo/texlive-module-pst-ode-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp-2017.tar.xz mirror://gentoo/texlive-module-pst-optic-2017.tar.xz mirror://gentoo/texlive-module-pst-osci-2017.tar.xz mirror://gentoo/texlive-module-pst-ovl-2017.tar.xz mirror://gentoo/texlive-module-pst-pad-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr-2017.tar.xz mirror://gentoo/texlive-module-pst-perspective-2017.tar.xz mirror://gentoo/texlive-module-pst-platon-2017.tar.xz mirror://gentoo/texlive-module-pst-plot-2017.tar.xz mirror://gentoo/texlive-module-pst-poly-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley-2017.tar.xz mirror://gentoo/texlive-module-pst-qtree-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans-2017.tar.xz mirror://gentoo/texlive-module-pst-shell-2017.tar.xz mirror://gentoo/texlive-module-pst-sigsys-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem-2017.tar.xz mirror://gentoo/texlive-module-pst-solides3d-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban-2017.tar.xz mirror://gentoo/texlive-module-pst-spectra-2017.tar.xz mirror://gentoo/texlive-module-pst-spinner-2017.tar.xz mirror://gentoo/texlive-module-pst-spirograph-2017.tar.xz mirror://gentoo/texlive-module-pst-stru-2017.tar.xz mirror://gentoo/texlive-module-pst-support-2017.tar.xz mirror://gentoo/texlive-module-pst-text-2017.tar.xz mirror://gentoo/texlive-module-pst-thick-2017.tar.xz mirror://gentoo/texlive-module-pst-tools-2017.tar.xz mirror://gentoo/texlive-module-pst-tree-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz-2017.tar.xz mirror://gentoo/texlive-module-pst-uml-2017.tar.xz mirror://gentoo/texlive-module-pst-vectorian-2017.tar.xz mirror://gentoo/texlive-module-pst-vowel-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d-2017.tar.xz mirror://gentoo/texlive-module-pst2pdf-2017.tar.xz mirror://gentoo/texlive-module-pstricks-2017.tar.xz mirror://gentoo/texlive-module-pstricks-add-2017.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes-2017.tar.xz mirror://gentoo/texlive-module-rputover-2017.tar.xz mirror://gentoo/texlive-module-uml-2017.tar.xz mirror://gentoo/texlive-module-vaucanson-g-2017.tar.xz mirror://gentoo/texlive-module-vocaltract-2017.tar.xz mirror://gentoo/texlive-module-collection-pstricks-2017.tar.xz doc? ( mirror://gentoo/texlive-module-auto-pst-pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-bclogo.doc-2017.tar.xz mirror://gentoo/texlive-module-dsptricks.doc-2017.tar.xz mirror://gentoo/texlive-module-makeplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftricks.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftricks2.doc-2017.tar.xz mirror://gentoo/texlive-module-pedigree-perl.doc-2017.tar.xz mirror://gentoo/texlive-module-psbao.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-2dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-3dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-arrow.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-am.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-asr.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bar.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-barcode.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bezier.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-blur.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bspline.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-calendar.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-cie.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-circ.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-coil.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-cox.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eps.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-exa.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fill.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fit.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fractal.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fun.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-func.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-gantt.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-geo.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ghsb.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-grad.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-graphicx.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-infixplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-jtree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-knot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-labo.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-layout.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-lens.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-math.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-mirror.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-node.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ode.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-optic.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-osci.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ovl.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pad.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-perspective.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-platon.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-plot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-poly.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-shell.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-sigsys.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-solides3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spectra.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spinner.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spirograph.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-stru.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-support.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-text.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-thick.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-uml.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vectorian.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vowel.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst2pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks-add.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-rputover.doc-2017.tar.xz mirror://gentoo/texlive-module-uml.doc-2017.tar.xz mirror://gentoo/texlive-module-vaucanson-g.doc-2017.tar.xz mirror://gentoo/texlive-module-vocaltract.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-auto-pst-pdf.source-2017.tar.xz mirror://gentoo/texlive-module-makeplot.source-2017.tar.xz mirror://gentoo/texlive-module-pst-3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos.source-2017.tar.xz mirror://gentoo/texlive-module-pst-am.source-2017.tar.xz mirror://gentoo/texlive-module-pst-bar.source-2017.tar.xz mirror://gentoo/texlive-module-pst-blur.source-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons.source-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction.source-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield.source-2017.tar.xz mirror://gentoo/texlive-module-pst-eps.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fill.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fit.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fun.source-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect.source-2017.tar.xz mirror://gentoo/texlive-module-pst-lens.source-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.source-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pad.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr.source-2017.tar.xz mirror://gentoo/texlive-module-pst-platon.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley.source-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans.source-2017.tar.xz mirror://gentoo/texlive-module-pst-shell.source-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe.source-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.source-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban.source-2017.tar.xz mirror://gentoo/texlive-module-pst-text.source-2017.tar.xz mirror://gentoo/texlive-module-pst-thick.source-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz.source-2017.tar.xz mirror://gentoo/texlive-module-pst-uml.source-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d.source-2017.tar.xz mirror://gentoo/texlive-module-uml.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56561f1e974e7912d64566eb53d1572b
+_md5_=441544230bfe3e670e76755dd2bb8950
diff --git a/metadata/md5-cache/dev-texlive/texlive-publishers-2017 b/metadata/md5-cache/dev-texlive/texlive-publishers-2017
index 7003246aed27..6e240a0186e5 100644
--- a/metadata/md5-cache/dev-texlive/texlive-publishers-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-publishers-2017
@@ -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 ~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=Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-IEEEconf-2017.tar.xz mirror://gentoo/texlive-module-IEEEtran-2017.tar.xz mirror://gentoo/texlive-module-aastex-2017.tar.xz mirror://gentoo/texlive-module-abntex2-2017.tar.xz mirror://gentoo/texlive-module-acmart-2017.tar.xz mirror://gentoo/texlive-module-acmconf-2017.tar.xz mirror://gentoo/texlive-module-active-conf-2017.tar.xz mirror://gentoo/texlive-module-adfathesis-2017.tar.xz mirror://gentoo/texlive-module-afparticle-2017.tar.xz mirror://gentoo/texlive-module-afthesis-2017.tar.xz mirror://gentoo/texlive-module-aguplus-2017.tar.xz mirror://gentoo/texlive-module-aiaa-2017.tar.xz mirror://gentoo/texlive-module-ametsoc-2017.tar.xz mirror://gentoo/texlive-module-anufinalexam-2017.tar.xz mirror://gentoo/texlive-module-aomart-2017.tar.xz mirror://gentoo/texlive-module-apa-2017.tar.xz mirror://gentoo/texlive-module-apa6-2017.tar.xz mirror://gentoo/texlive-module-apa6e-2017.tar.xz mirror://gentoo/texlive-module-arsclassica-2017.tar.xz mirror://gentoo/texlive-module-articleingud-2017.tar.xz mirror://gentoo/texlive-module-asaetr-2017.tar.xz mirror://gentoo/texlive-module-ascelike-2017.tar.xz mirror://gentoo/texlive-module-aucklandthesis-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis-2017.tar.xz mirror://gentoo/texlive-module-bangorexam-2017.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin-2017.tar.xz mirror://gentoo/texlive-module-beamer-verona-2017.tar.xz mirror://gentoo/texlive-module-bgteubner-2017.tar.xz mirror://gentoo/texlive-module-br-lex-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation-2017.tar.xz mirror://gentoo/texlive-module-cascadilla-2017.tar.xz mirror://gentoo/texlive-module-chem-journal-2017.tar.xz mirror://gentoo/texlive-module-classicthesis-2017.tar.xz mirror://gentoo/texlive-module-cleanthesis-2017.tar.xz mirror://gentoo/texlive-module-cmpj-2017.tar.xz mirror://gentoo/texlive-module-confproc-2017.tar.xz mirror://gentoo/texlive-module-cquthesis-2017.tar.xz mirror://gentoo/texlive-module-dccpaper-2017.tar.xz mirror://gentoo/texlive-module-dithesis-2017.tar.xz mirror://gentoo/texlive-module-ebook-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis-2017.tar.xz mirror://gentoo/texlive-module-ejpecp-2017.tar.xz mirror://gentoo/texlive-module-ekaia-2017.tar.xz mirror://gentoo/texlive-module-elbioimp-2017.tar.xz mirror://gentoo/texlive-module-elsarticle-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis-2017.tar.xz mirror://gentoo/texlive-module-emisa-2017.tar.xz mirror://gentoo/texlive-module-erdc-2017.tar.xz mirror://gentoo/texlive-module-estcpmm-2017.tar.xz mirror://gentoo/texlive-module-fbithesis-2017.tar.xz mirror://gentoo/texlive-module-fcavtex-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc-2017.tar.xz mirror://gentoo/texlive-module-fei-2017.tar.xz mirror://gentoo/texlive-module-gaceta-2017.tar.xz mirror://gentoo/texlive-module-gatech-thesis-2017.tar.xz mirror://gentoo/texlive-module-gradstudentresume-2017.tar.xz mirror://gentoo/texlive-module-grant-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis-2017.tar.xz mirror://gentoo/texlive-module-gzt-2017.tar.xz mirror://gentoo/texlive-module-h2020proposal-2017.tar.xz mirror://gentoo/texlive-module-har2nat-2017.tar.xz mirror://gentoo/texlive-module-hobete-2017.tar.xz mirror://gentoo/texlive-module-hustthesis-2017.tar.xz mirror://gentoo/texlive-module-icsv-2017.tar.xz mirror://gentoo/texlive-module-ieeepes-2017.tar.xz mirror://gentoo/texlive-module-ijmart-2017.tar.xz mirror://gentoo/texlive-module-ijsra-2017.tar.xz mirror://gentoo/texlive-module-imac-2017.tar.xz mirror://gentoo/texlive-module-imtekda-2017.tar.xz mirror://gentoo/texlive-module-iscram-2017.tar.xz mirror://gentoo/texlive-module-jacow-2017.tar.xz mirror://gentoo/texlive-module-jmlr-2017.tar.xz mirror://gentoo/texlive-module-jpsj-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs-2017.tar.xz mirror://gentoo/texlive-module-kluwer-2017.tar.xz mirror://gentoo/texlive-module-ksp-thesis-2017.tar.xz mirror://gentoo/texlive-module-langsci-2017.tar.xz mirror://gentoo/texlive-module-lion-msc-2017.tar.xz mirror://gentoo/texlive-module-lni-2017.tar.xz mirror://gentoo/texlive-module-lps-2017.tar.xz mirror://gentoo/texlive-module-matc3-2017.tar.xz mirror://gentoo/texlive-module-matc3mem-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis-2017.tar.xz mirror://gentoo/texlive-module-mentis-2017.tar.xz mirror://gentoo/texlive-module-mnras-2017.tar.xz mirror://gentoo/texlive-module-msu-thesis-2017.tar.xz mirror://gentoo/texlive-module-mucproc-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis-2017.tar.xz mirror://gentoo/texlive-module-musuos-2017.tar.xz mirror://gentoo/texlive-module-muthesis-2017.tar.xz mirror://gentoo/texlive-module-mynsfc-2017.tar.xz mirror://gentoo/texlive-module-nature-2017.tar.xz mirror://gentoo/texlive-module-navydocs-2017.tar.xz mirror://gentoo/texlive-module-nddiss-2017.tar.xz mirror://gentoo/texlive-module-ndsu-thesis-2017.tar.xz mirror://gentoo/texlive-module-novel-2017.tar.xz mirror://gentoo/texlive-module-nwejm-2017.tar.xz mirror://gentoo/texlive-module-nih-2017.tar.xz mirror://gentoo/texlive-module-nihbiosketch-2017.tar.xz mirror://gentoo/texlive-module-nostarch-2017.tar.xz mirror://gentoo/texlive-module-nrc-2017.tar.xz mirror://gentoo/texlive-module-onrannual-2017.tar.xz mirror://gentoo/texlive-module-opteng-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint-2017.tar.xz mirror://gentoo/texlive-module-pittetd-2017.tar.xz mirror://gentoo/texlive-module-pkuthss-2017.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin-2017.tar.xz mirror://gentoo/texlive-module-pracjourn-2017.tar.xz mirror://gentoo/texlive-module-procIAGssymp-2017.tar.xz mirror://gentoo/texlive-module-proposal-2017.tar.xz mirror://gentoo/texlive-module-ptptex-2017.tar.xz mirror://gentoo/texlive-module-psu-thesis-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica-2017.tar.xz mirror://gentoo/texlive-module-resumecls-2017.tar.xz mirror://gentoo/texlive-module-revtex-2017.tar.xz mirror://gentoo/texlive-module-revtex4-2017.tar.xz mirror://gentoo/texlive-module-ryethesis-2017.tar.xz mirror://gentoo/texlive-module-sageep-2017.tar.xz mirror://gentoo/texlive-module-sapthesis-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl-2017.tar.xz mirror://gentoo/texlive-module-schule-2017.tar.xz mirror://gentoo/texlive-module-sduthesis-2017.tar.xz mirror://gentoo/texlive-module-seuthesis-2017.tar.xz mirror://gentoo/texlive-module-seuthesix-2017.tar.xz mirror://gentoo/texlive-module-soton-2017.tar.xz mirror://gentoo/texlive-module-sphdthesis-2017.tar.xz mirror://gentoo/texlive-module-spie-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch-2017.tar.xz mirror://gentoo/texlive-module-suftesi-2017.tar.xz mirror://gentoo/texlive-module-sugconf-2017.tar.xz mirror://gentoo/texlive-module-tabriz-thesis-2017.tar.xz mirror://gentoo/texlive-module-texilikechaps-2017.tar.xz mirror://gentoo/texlive-module-texilikecover-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac-2017.tar.xz mirror://gentoo/texlive-module-thuthesis-2017.tar.xz mirror://gentoo/texlive-module-toptesi-2017.tar.xz mirror://gentoo/texlive-module-tudscr-2017.tar.xz mirror://gentoo/texlive-module-tugboat-2017.tar.xz mirror://gentoo/texlive-module-tugboat-plain-2017.tar.xz mirror://gentoo/texlive-module-turabian-2017.tar.xz mirror://gentoo/texlive-module-tui-2017.tar.xz mirror://gentoo/texlive-module-uaclasses-2017.tar.xz mirror://gentoo/texlive-module-uafthesis-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs-2017.tar.xz mirror://gentoo/texlive-module-ucbthesis-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis-2017.tar.xz mirror://gentoo/texlive-module-ucthesis-2017.tar.xz mirror://gentoo/texlive-module-uestcthesis-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis-2017.tar.xz mirror://gentoo/texlive-module-ulthese-2017.tar.xz mirror://gentoo/texlive-module-umbclegislation-2017.tar.xz mirror://gentoo/texlive-module-umthesis-2017.tar.xz mirror://gentoo/texlive-module-umich-thesis-2017.tar.xz mirror://gentoo/texlive-module-unamth-template-2017.tar.xz mirror://gentoo/texlive-module-unamthesis-2017.tar.xz mirror://gentoo/texlive-module-unswcover-2017.tar.xz mirror://gentoo/texlive-module-uothesis-2017.tar.xz mirror://gentoo/texlive-module-urcls-2017.tar.xz mirror://gentoo/texlive-module-uowthesis-2017.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage-2017.tar.xz mirror://gentoo/texlive-module-uspatent-2017.tar.xz mirror://gentoo/texlive-module-ut-thesis-2017.tar.xz mirror://gentoo/texlive-module-uwthesis-2017.tar.xz mirror://gentoo/texlive-module-vancouver-2017.tar.xz mirror://gentoo/texlive-module-xduthesis-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky-2017.tar.xz mirror://gentoo/texlive-module-yathesis-2017.tar.xz mirror://gentoo/texlive-module-york-thesis-2017.tar.xz mirror://gentoo/texlive-module-collection-publishers-2017.tar.xz doc? ( mirror://gentoo/texlive-module-IEEEconf.doc-2017.tar.xz mirror://gentoo/texlive-module-IEEEtran.doc-2017.tar.xz mirror://gentoo/texlive-module-aastex.doc-2017.tar.xz mirror://gentoo/texlive-module-abntex2.doc-2017.tar.xz mirror://gentoo/texlive-module-acmart.doc-2017.tar.xz mirror://gentoo/texlive-module-acmconf.doc-2017.tar.xz mirror://gentoo/texlive-module-active-conf.doc-2017.tar.xz mirror://gentoo/texlive-module-adfathesis.doc-2017.tar.xz mirror://gentoo/texlive-module-afparticle.doc-2017.tar.xz mirror://gentoo/texlive-module-afthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-aguplus.doc-2017.tar.xz mirror://gentoo/texlive-module-aiaa.doc-2017.tar.xz mirror://gentoo/texlive-module-ametsoc.doc-2017.tar.xz mirror://gentoo/texlive-module-anufinalexam.doc-2017.tar.xz mirror://gentoo/texlive-module-aomart.doc-2017.tar.xz mirror://gentoo/texlive-module-apa.doc-2017.tar.xz mirror://gentoo/texlive-module-apa6.doc-2017.tar.xz mirror://gentoo/texlive-module-apa6e.doc-2017.tar.xz mirror://gentoo/texlive-module-arsclassica.doc-2017.tar.xz mirror://gentoo/texlive-module-articleingud.doc-2017.tar.xz mirror://gentoo/texlive-module-asaetr.doc-2017.tar.xz mirror://gentoo/texlive-module-ascelike.doc-2017.tar.xz mirror://gentoo/texlive-module-aucklandthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-bangorexam.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-verona.doc-2017.tar.xz mirror://gentoo/texlive-module-bgteubner.doc-2017.tar.xz mirror://gentoo/texlive-module-br-lex.doc-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.doc-2017.tar.xz mirror://gentoo/texlive-module-cascadilla.doc-2017.tar.xz mirror://gentoo/texlive-module-classicthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-cleanthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-cmpj.doc-2017.tar.xz mirror://gentoo/texlive-module-confproc.doc-2017.tar.xz mirror://gentoo/texlive-module-cquthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-dccpaper.doc-2017.tar.xz mirror://gentoo/texlive-module-dithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ejpecp.doc-2017.tar.xz mirror://gentoo/texlive-module-ekaia.doc-2017.tar.xz mirror://gentoo/texlive-module-elbioimp.doc-2017.tar.xz mirror://gentoo/texlive-module-elsarticle.doc-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-emisa.doc-2017.tar.xz mirror://gentoo/texlive-module-erdc.doc-2017.tar.xz mirror://gentoo/texlive-module-estcpmm.doc-2017.tar.xz mirror://gentoo/texlive-module-fbithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-fcavtex.doc-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-fei.doc-2017.tar.xz mirror://gentoo/texlive-module-gaceta.doc-2017.tar.xz mirror://gentoo/texlive-module-gatech-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-gradstudentresume.doc-2017.tar.xz mirror://gentoo/texlive-module-grant.doc-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-gzt.doc-2017.tar.xz mirror://gentoo/texlive-module-h2020proposal.doc-2017.tar.xz mirror://gentoo/texlive-module-har2nat.doc-2017.tar.xz mirror://gentoo/texlive-module-hobete.doc-2017.tar.xz mirror://gentoo/texlive-module-hustthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-icsv.doc-2017.tar.xz mirror://gentoo/texlive-module-ieeepes.doc-2017.tar.xz mirror://gentoo/texlive-module-ijmart.doc-2017.tar.xz mirror://gentoo/texlive-module-ijsra.doc-2017.tar.xz mirror://gentoo/texlive-module-imac.doc-2017.tar.xz mirror://gentoo/texlive-module-imtekda.doc-2017.tar.xz mirror://gentoo/texlive-module-iscram.doc-2017.tar.xz mirror://gentoo/texlive-module-jacow.doc-2017.tar.xz mirror://gentoo/texlive-module-jmlr.doc-2017.tar.xz mirror://gentoo/texlive-module-jpsj.doc-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs.doc-2017.tar.xz mirror://gentoo/texlive-module-kluwer.doc-2017.tar.xz mirror://gentoo/texlive-module-ksp-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-langsci.doc-2017.tar.xz mirror://gentoo/texlive-module-lion-msc.doc-2017.tar.xz mirror://gentoo/texlive-module-lni.doc-2017.tar.xz mirror://gentoo/texlive-module-lps.doc-2017.tar.xz mirror://gentoo/texlive-module-matc3.doc-2017.tar.xz mirror://gentoo/texlive-module-matc3mem.doc-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mentis.doc-2017.tar.xz mirror://gentoo/texlive-module-mnras.doc-2017.tar.xz mirror://gentoo/texlive-module-msu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mucproc.doc-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-musuos.doc-2017.tar.xz mirror://gentoo/texlive-module-muthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mynsfc.doc-2017.tar.xz mirror://gentoo/texlive-module-nature.doc-2017.tar.xz mirror://gentoo/texlive-module-navydocs.doc-2017.tar.xz mirror://gentoo/texlive-module-nddiss.doc-2017.tar.xz mirror://gentoo/texlive-module-ndsu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-novel.doc-2017.tar.xz mirror://gentoo/texlive-module-nwejm.doc-2017.tar.xz mirror://gentoo/texlive-module-nih.doc-2017.tar.xz mirror://gentoo/texlive-module-nihbiosketch.doc-2017.tar.xz mirror://gentoo/texlive-module-nostarch.doc-2017.tar.xz mirror://gentoo/texlive-module-nrc.doc-2017.tar.xz mirror://gentoo/texlive-module-onrannual.doc-2017.tar.xz mirror://gentoo/texlive-module-opteng.doc-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint.doc-2017.tar.xz mirror://gentoo/texlive-module-pittetd.doc-2017.tar.xz mirror://gentoo/texlive-module-pkuthss.doc-2017.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin.doc-2017.tar.xz mirror://gentoo/texlive-module-pracjourn.doc-2017.tar.xz mirror://gentoo/texlive-module-procIAGssymp.doc-2017.tar.xz mirror://gentoo/texlive-module-proposal.doc-2017.tar.xz mirror://gentoo/texlive-module-ptptex.doc-2017.tar.xz mirror://gentoo/texlive-module-psu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica.doc-2017.tar.xz mirror://gentoo/texlive-module-resumecls.doc-2017.tar.xz mirror://gentoo/texlive-module-revtex.doc-2017.tar.xz mirror://gentoo/texlive-module-revtex4.doc-2017.tar.xz mirror://gentoo/texlive-module-ryethesis.doc-2017.tar.xz mirror://gentoo/texlive-module-sageep.doc-2017.tar.xz mirror://gentoo/texlive-module-sapthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl.doc-2017.tar.xz mirror://gentoo/texlive-module-schule.doc-2017.tar.xz mirror://gentoo/texlive-module-sduthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-seuthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-seuthesix.doc-2017.tar.xz mirror://gentoo/texlive-module-soton.doc-2017.tar.xz mirror://gentoo/texlive-module-sphdthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-spie.doc-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl.doc-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch.doc-2017.tar.xz mirror://gentoo/texlive-module-suftesi.doc-2017.tar.xz mirror://gentoo/texlive-module-sugconf.doc-2017.tar.xz mirror://gentoo/texlive-module-tabriz-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf.doc-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.doc-2017.tar.xz mirror://gentoo/texlive-module-thuthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-toptesi.doc-2017.tar.xz mirror://gentoo/texlive-module-tudscr.doc-2017.tar.xz mirror://gentoo/texlive-module-tugboat.doc-2017.tar.xz mirror://gentoo/texlive-module-tugboat-plain.doc-2017.tar.xz mirror://gentoo/texlive-module-turabian.doc-2017.tar.xz mirror://gentoo/texlive-module-tui.doc-2017.tar.xz mirror://gentoo/texlive-module-uaclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-uafthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.doc-2017.tar.xz mirror://gentoo/texlive-module-ucbthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ucthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uestcthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment.doc-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder.doc-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ulthese.doc-2017.tar.xz mirror://gentoo/texlive-module-umbclegislation.doc-2017.tar.xz mirror://gentoo/texlive-module-umthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-umich-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-unamth-template.doc-2017.tar.xz mirror://gentoo/texlive-module-unamthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-unswcover.doc-2017.tar.xz mirror://gentoo/texlive-module-uothesis.doc-2017.tar.xz mirror://gentoo/texlive-module-urcls.doc-2017.tar.xz mirror://gentoo/texlive-module-uowthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage.doc-2017.tar.xz mirror://gentoo/texlive-module-uspatent.doc-2017.tar.xz mirror://gentoo/texlive-module-ut-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uwthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-vancouver.doc-2017.tar.xz mirror://gentoo/texlive-module-xduthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky.doc-2017.tar.xz mirror://gentoo/texlive-module-yathesis.doc-2017.tar.xz mirror://gentoo/texlive-module-york-thesis.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-IEEEconf.source-2017.tar.xz mirror://gentoo/texlive-module-acmart.source-2017.tar.xz mirror://gentoo/texlive-module-acmconf.source-2017.tar.xz mirror://gentoo/texlive-module-active-conf.source-2017.tar.xz mirror://gentoo/texlive-module-adfathesis.source-2017.tar.xz mirror://gentoo/texlive-module-afparticle.source-2017.tar.xz mirror://gentoo/texlive-module-aiaa.source-2017.tar.xz mirror://gentoo/texlive-module-aomart.source-2017.tar.xz mirror://gentoo/texlive-module-apa6.source-2017.tar.xz mirror://gentoo/texlive-module-apa6e.source-2017.tar.xz mirror://gentoo/texlive-module-articleingud.source-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-bangorexam.source-2017.tar.xz mirror://gentoo/texlive-module-bgteubner.source-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.source-2017.tar.xz mirror://gentoo/texlive-module-confproc.source-2017.tar.xz mirror://gentoo/texlive-module-cquthesis.source-2017.tar.xz mirror://gentoo/texlive-module-dccpaper.source-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-ejpecp.source-2017.tar.xz mirror://gentoo/texlive-module-ekaia.source-2017.tar.xz mirror://gentoo/texlive-module-elbioimp.source-2017.tar.xz mirror://gentoo/texlive-module-elsarticle.source-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis.source-2017.tar.xz mirror://gentoo/texlive-module-emisa.source-2017.tar.xz mirror://gentoo/texlive-module-erdc.source-2017.tar.xz mirror://gentoo/texlive-module-estcpmm.source-2017.tar.xz mirror://gentoo/texlive-module-fbithesis.source-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc.source-2017.tar.xz mirror://gentoo/texlive-module-fei.source-2017.tar.xz mirror://gentoo/texlive-module-grant.source-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis.source-2017.tar.xz mirror://gentoo/texlive-module-gzt.source-2017.tar.xz mirror://gentoo/texlive-module-hustthesis.source-2017.tar.xz mirror://gentoo/texlive-module-icsv.source-2017.tar.xz mirror://gentoo/texlive-module-ijmart.source-2017.tar.xz mirror://gentoo/texlive-module-imtekda.source-2017.tar.xz mirror://gentoo/texlive-module-jmlr.source-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs.source-2017.tar.xz mirror://gentoo/texlive-module-kluwer.source-2017.tar.xz mirror://gentoo/texlive-module-lni.source-2017.tar.xz mirror://gentoo/texlive-module-lps.source-2017.tar.xz mirror://gentoo/texlive-module-matc3.source-2017.tar.xz mirror://gentoo/texlive-module-matc3mem.source-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis.source-2017.tar.xz mirror://gentoo/texlive-module-mentis.source-2017.tar.xz mirror://gentoo/texlive-module-mucproc.source-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-musuos.source-2017.tar.xz mirror://gentoo/texlive-module-mynsfc.source-2017.tar.xz mirror://gentoo/texlive-module-navydocs.source-2017.tar.xz mirror://gentoo/texlive-module-nddiss.source-2017.tar.xz mirror://gentoo/texlive-module-nwejm.source-2017.tar.xz mirror://gentoo/texlive-module-nostarch.source-2017.tar.xz mirror://gentoo/texlive-module-nrc.source-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint.source-2017.tar.xz mirror://gentoo/texlive-module-pittetd.source-2017.tar.xz mirror://gentoo/texlive-module-pracjourn.source-2017.tar.xz mirror://gentoo/texlive-module-proposal.source-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica.source-2017.tar.xz mirror://gentoo/texlive-module-resumecls.source-2017.tar.xz mirror://gentoo/texlive-module-revtex.source-2017.tar.xz mirror://gentoo/texlive-module-revtex4.source-2017.tar.xz mirror://gentoo/texlive-module-ryethesis.source-2017.tar.xz mirror://gentoo/texlive-module-sageep.source-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl.source-2017.tar.xz mirror://gentoo/texlive-module-schule.source-2017.tar.xz mirror://gentoo/texlive-module-sduthesis.source-2017.tar.xz mirror://gentoo/texlive-module-seuthesis.source-2017.tar.xz mirror://gentoo/texlive-module-seuthesix.source-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl.source-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch.source-2017.tar.xz mirror://gentoo/texlive-module-suftesi.source-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf.source-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.source-2017.tar.xz mirror://gentoo/texlive-module-thuthesis.source-2017.tar.xz mirror://gentoo/texlive-module-toptesi.source-2017.tar.xz mirror://gentoo/texlive-module-tudscr.source-2017.tar.xz mirror://gentoo/texlive-module-tugboat.source-2017.tar.xz mirror://gentoo/texlive-module-uaclasses.source-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.source-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.source-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment.source-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder.source-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis.source-2017.tar.xz mirror://gentoo/texlive-module-ulthese.source-2017.tar.xz mirror://gentoo/texlive-module-uothesis.source-2017.tar.xz mirror://gentoo/texlive-module-xduthesis.source-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic.source-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky.source-2017.tar.xz mirror://gentoo/texlive-module-yathesis.source-2017.tar.xz mirror://gentoo/texlive-module-york-thesis.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4443258439c7299608d490b699b6c50
+_md5_=dd4838081bae6d8ae1c4ec002d9702eb
diff --git a/metadata/md5-cache/dev-texlive/texlive-xetex-2017 b/metadata/md5-cache/dev-texlive/texlive-xetex-2017
index 142c6aa35b65..1eba5effe78a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-xetex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-xetex-2017
@@ -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 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=Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=app-text/texlive-core-2007* >=dev-texlive/texlive-latexextra-2010 >=app-text/texlive-core-2010[xetex] dev-texlive/texlive-mathscience !<dev-texlive/texlive-mathextra-2012 dev-texlive/texlive-luatex >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arabxetex-2017.tar.xz mirror://gentoo/texlive-module-awesomebox-2017.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi-2017.tar.xz mirror://gentoo/texlive-module-bidicontour-2017.tar.xz mirror://gentoo/texlive-module-bidipagegrid-2017.tar.xz mirror://gentoo/texlive-module-bidishadowtext-2017.tar.xz mirror://gentoo/texlive-module-bidipresentation-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian-2017.tar.xz mirror://gentoo/texlive-module-font-change-xetex-2017.tar.xz mirror://gentoo/texlive-module-fontbook-2017.tar.xz mirror://gentoo/texlive-module-fontwrap-2017.tar.xz mirror://gentoo/texlive-module-interchar-2017.tar.xz mirror://gentoo/texlive-module-philokalia-2017.tar.xz mirror://gentoo/texlive-module-ptext-2017.tar.xz mirror://gentoo/texlive-module-quran-2017.tar.xz mirror://gentoo/texlive-module-realscripts-2017.tar.xz mirror://gentoo/texlive-module-simple-resume-cv-2017.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation-2017.tar.xz mirror://gentoo/texlive-module-ucharclasses-2017.tar.xz mirror://gentoo/texlive-module-unicode-bidi-2017.tar.xz mirror://gentoo/texlive-module-unisugar-2017.tar.xz mirror://gentoo/texlive-module-xebaposter-2017.tar.xz mirror://gentoo/texlive-module-xecjk-2017.tar.xz mirror://gentoo/texlive-module-xecolor-2017.tar.xz mirror://gentoo/texlive-module-xecyr-2017.tar.xz mirror://gentoo/texlive-module-xeindex-2017.tar.xz mirror://gentoo/texlive-module-xesearch-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor-2017.tar.xz mirror://gentoo/texlive-module-xetex-2017.tar.xz mirror://gentoo/texlive-module-xetex-itrans-2017.tar.xz mirror://gentoo/texlive-module-xetex-pstricks-2017.tar.xz mirror://gentoo/texlive-module-xetex-tibetan-2017.tar.xz mirror://gentoo/texlive-module-xetexconfig-2017.tar.xz mirror://gentoo/texlive-module-xetexfontinfo-2017.tar.xz mirror://gentoo/texlive-module-xetexko-2017.tar.xz mirror://gentoo/texlive-module-xevlna-2017.tar.xz mirror://gentoo/texlive-module-collection-xetex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-arabxetex.doc-2017.tar.xz mirror://gentoo/texlive-module-awesomebox.doc-2017.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi.doc-2017.tar.xz mirror://gentoo/texlive-module-bidicontour.doc-2017.tar.xz mirror://gentoo/texlive-module-bidipagegrid.doc-2017.tar.xz mirror://gentoo/texlive-module-bidishadowtext.doc-2017.tar.xz mirror://gentoo/texlive-module-bidipresentation.doc-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian.doc-2017.tar.xz mirror://gentoo/texlive-module-font-change-xetex.doc-2017.tar.xz mirror://gentoo/texlive-module-fontbook.doc-2017.tar.xz mirror://gentoo/texlive-module-fontwrap.doc-2017.tar.xz mirror://gentoo/texlive-module-interchar.doc-2017.tar.xz mirror://gentoo/texlive-module-philokalia.doc-2017.tar.xz mirror://gentoo/texlive-module-ptext.doc-2017.tar.xz mirror://gentoo/texlive-module-quran.doc-2017.tar.xz mirror://gentoo/texlive-module-realscripts.doc-2017.tar.xz mirror://gentoo/texlive-module-simple-resume-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation.doc-2017.tar.xz mirror://gentoo/texlive-module-ucharclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-bidi.doc-2017.tar.xz mirror://gentoo/texlive-module-unisugar.doc-2017.tar.xz mirror://gentoo/texlive-module-xebaposter.doc-2017.tar.xz mirror://gentoo/texlive-module-xecjk.doc-2017.tar.xz mirror://gentoo/texlive-module-xecolor.doc-2017.tar.xz mirror://gentoo/texlive-module-xecyr.doc-2017.tar.xz mirror://gentoo/texlive-module-xeindex.doc-2017.tar.xz mirror://gentoo/texlive-module-xesearch.doc-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-itrans.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-pstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-tibetan.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexfontinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexko.doc-2017.tar.xz mirror://gentoo/texlive-module-xevlna.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-arabxetex.source-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian.source-2017.tar.xz mirror://gentoo/texlive-module-fontbook.source-2017.tar.xz mirror://gentoo/texlive-module-philokalia.source-2017.tar.xz mirror://gentoo/texlive-module-realscripts.source-2017.tar.xz mirror://gentoo/texlive-module-xecjk.source-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6fda326016c77991ccd3e689c9c4cf7b
+_md5_=4b70ad1c46057276ca418de3cac092c6
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 020a4745a5b6..7c37fd09f124 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/boost-build-1.65.0 b/metadata/md5-cache/dev-util/boost-build-1.65.0
index 8110d68cb974..1945b4d96c7b 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.65.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.65.0
@@ -4,7 +4,7 @@ DESCRIPTION=A system for large project software construction, simple to use and
 EAPI=6
 HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
 IUSE=examples python test python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Boost-1.0
 RDEPEND=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-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1
 REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4f81ed06612ccba421bac4ecbad6619c
+_md5_=720d64eaf0e4bccd0e917472784e72d8
diff --git a/metadata/md5-cache/dev-util/ccache-3.3.4-r1 b/metadata/md5-cache/dev-util/ccache-3.3.4-r1
index 6cfaef4d4a68..8779e954a778 100644
--- a/metadata/md5-cache/dev-util/ccache-3.3.4-r1
+++ b/metadata/md5-cache/dev-util/ccache-3.3.4-r1
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils sys-libs/zlib
 DESCRIPTION=fast compiler cache
 EAPI=6
 HOMEPAGE=https://ccache.samba.org/
-KEYWORDS=~amd64 ~hppa ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~hppa ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.xz
 _eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
-_md5_=7831b5115efb32b095a48dafcd7ea5e6
+_md5_=42ad61ceb23acf48f7f790cdb31f3677
diff --git a/metadata/md5-cache/dev-util/cmake-3.11.0_rc2 b/metadata/md5-cache/dev-util/cmake-3.11.0_rc3
similarity index 94%
rename from metadata/md5-cache/dev-util/cmake-3.11.0_rc2
rename to metadata/md5-cache/dev-util/cmake-3.11.0_rc3
index fca55c064a1b..ed8362527557 100644
--- a/metadata/md5-cache/dev-util/cmake-3.11.0_rc2
+++ b/metadata/md5-cache/dev-util/cmake-3.11.0_rc3
@@ -7,6 +7,6 @@ IUSE=doc emacs server system-jsoncpp ncurses qt5 test
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
-SRC_URI=https://cmake.org/files/v3.11/cmake-3.11.0-rc2.tar.gz
+SRC_URI=https://cmake.org/files/v3.11/cmake-3.11.0-rc3.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b294123149518703eae4f4fdc29dfae7
+_md5_=4a08c56eb50af4e299df9066c36b3e1e
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.30 b/metadata/md5-cache/dev-util/cmdtest-0.30
index d6a5b969997f..3f8e496551ef 100644
--- a/metadata/md5-cache/dev-util/cmdtest-0.30
+++ b/metadata/md5-cache/dev-util/cmdtest-0.30
@@ -4,11 +4,11 @@ DESCRIPTION=black box tests Unix command line tools
 EAPI=6
 HOMEPAGE=http://liw.fi/cmdtest/
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ttystatus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.30.orig.tar.xz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18247501b87b179acb7f8158916194d0
+_md5_=00e99a871bdf42b15fd1e2438d10b1b1
diff --git a/metadata/md5-cache/dev-util/csup-20060318-r1 b/metadata/md5-cache/dev-util/csup-20060318-r1
new file mode 100644
index 000000000000..89ac28e2d772
--- /dev/null
+++ b/metadata/md5-cache/dev-util/csup-20060318-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/zlib:0= dev-libs/openssl:0= >=sys-devel/bison-2.1
+DESCRIPTION=A rewrite of CVSup
+EAPI=6
+HOMEPAGE=http://www.mu.org/~mux/csup.html
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=sys-libs/zlib:0= dev-libs/openssl:0= !>=sys-freebsd/freebsd-ubin-6.2_beta1
+SLOT=0
+SRC_URI=http://mu.org/~mux/csup-snap-20060318.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c0a198250e923445ac906fcd6ddcae82
diff --git a/metadata/md5-cache/dev-util/glslang-6.2.2596 b/metadata/md5-cache/dev-util/glslang-6.2.2596
new file mode 100644
index 000000000000..099af901cff0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glslang-6.2.2596
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
+EAPI=6
+HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
+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
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/glslang/archive/6.2.2596.tar.gz -> glslang-6.2.2596.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b65ac377e156016333f2124783577db7
diff --git a/metadata/md5-cache/dev-util/glslang-9999 b/metadata/md5-cache/dev-util/glslang-9999
new file mode 100644
index 000000000000..1d5c3b965ce5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glslang-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
+EAPI=6
+HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
+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
+LICENSE=BSD
+SLOT=0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d9378b5f7e3da41762c0e09824c0bf9f
diff --git a/metadata/md5-cache/dev-util/lldb-6.0.0 b/metadata/md5-cache/dev-util/lldb-6.0.0
index 731b880fe5ce..257f3793a557 100644
--- a/metadata/md5-cache/dev-util/lldb-6.0.0
+++ b/metadata/md5-cache/dev-util/lldb-6.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=The LLVM debugger
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=libedit ncurses python test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=UoI-NCSA
 RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[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 ) >=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-devel/clang-6.0.0[xml] ~sys-devel/llvm-6.0.0 !<sys-devel/llvm-4.0
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/lldb-6.0.0.src.tar.xz test? ( https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz )
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=47cb411f4a0a1c71a5d4c7014cc42cc5
+_md5_=4cda5b445a7ca6d21c8dc6519b8e2504
diff --git a/metadata/md5-cache/dev-util/meson-0.41.2 b/metadata/md5-cache/dev-util/meson-0.41.2
deleted file mode 100644
index 87e956d947b3..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.41.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Open source build system
-EAPI=6
-HOMEPAGE=http://mesonbuild.com/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.41.2.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a297249d214e2b79d039d93e07ae428c
diff --git a/metadata/md5-cache/dev-util/meson-0.42.0 b/metadata/md5-cache/dev-util/meson-0.42.0
deleted file mode 100644
index ebc92870d5ba..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.42.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Open source build system
-EAPI=6
-HOMEPAGE=http://mesonbuild.com/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.42.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1760c5572adc5d3b9ee3dbb43e27bf45
diff --git a/metadata/md5-cache/dev-util/meson-0.42.1 b/metadata/md5-cache/dev-util/meson-0.42.1
deleted file mode 100644
index 65bf1a0a5c76..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.42.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Open source build system
-EAPI=6
-HOMEPAGE=http://mesonbuild.com/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.42.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1760c5572adc5d3b9ee3dbb43e27bf45
diff --git a/metadata/md5-cache/dev-util/meson-0.43.0 b/metadata/md5-cache/dev-util/meson-0.43.0
deleted file mode 100644
index 356bb2bec2fd..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.43.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Open source build system
-EAPI=6
-HOMEPAGE=http://mesonbuild.com/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.43.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a1ebaaf87444d2ce91393ef9d2f3314
diff --git a/metadata/md5-cache/dev-util/meson-0.44.0 b/metadata/md5-cache/dev-util/meson-0.44.0
deleted file mode 100644
index f5feae4f4acc..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.44.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Open source build system
-EAPI=6
-HOMEPAGE=http://mesonbuild.com/
-IUSE=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
-LICENSE=Apache-2.0
-RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.44.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b2972ba21ac2ce46c0ff65400524a09
diff --git a/metadata/md5-cache/dev-util/rr-5.1.0 b/metadata/md5-cache/dev-util/rr-5.1.0
new file mode 100644
index 000000000000..21a2ca8e91cb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rr-5.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib dev-libs/capnproto 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(+)] test? ( dev-python/pexpect[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-devel/gdb[xml] ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Record and Replay Framework
+EAPI=6
+HOMEPAGE=http://rr-project.org/
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=MIT BSD-2
+RDEPEND=sys-libs/zlib dev-libs/capnproto 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(+)] sys-devel/gdb[xml]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/mozilla/rr/archive/5.1.0.tar.gz -> mozilla-rr-5.1.0.tar.gz
+_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b53280e6671ddc1b9425878c22b8e968
diff --git a/metadata/md5-cache/dev-util/rustfmt-0.8.6 b/metadata/md5-cache/dev-util/rustfmt-0.8.6
new file mode 100644
index 000000000000..c5313100ec48
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rustfmt-0.8.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/rust-1.8.0 >=dev-util/cargo-0.13.0
+DESCRIPTION=Tool to find and fix Rust formatting issues
+EAPI=6
+HOMEPAGE=https://github.com/rust-lang-nursery/rustfmt
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.3/download -> aho-corasick-0.6.3.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/diff/0.1.10/download -> diff-0.1.10.crate https://crates.io/api/v1/crates/dtoa/0.4.1/download -> dtoa-0.4.1.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/extprim/1.2.2/download -> extprim-1.2.2.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/itoa/0.3.1/download -> itoa-0.3.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.23/download -> libc-0.2.23.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/1.0.1/download -> memchr-1.0.1.crate https://crates.io/api/v1/crates/num-traits/0.1.39/download -> num-traits-0.1.39.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/regex/0.2.2/download -> regex-0.2.2.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/rustc_version/0.2.1/download -> rustc_version-0.2.1.crate https://crates.io/api/v1/crates/rustfmt/0.8.6/download -> rustfmt-0.8.6.crate https://crates.io/api/v1/crates/semver/0.6.0/download -> semver-0.6.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.8/download -> serde-1.0.8.crate https://crates.io/api/v1/crates/serde_derive/1.0.8/download -> serde_derive-1.0.8.crate https://crates.io/api/v1/crates/serde_derive_internals/0.15.1/download -> serde_derive_internals-0.15.1.crate https://crates.io/api/v1/crates/serde_json/1.0.2/download -> serde_json-1.0.2.crate https://crates.io/api/v1/crates/strings/0.1.0/download -> strings-0.1.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/syntex_errors/0.59.0/download -> syntex_errors-0.59.0.crate https://crates.io/api/v1/crates/syntex_pos/0.59.0/download -> syntex_pos-0.59.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.59.0/download -> syntex_syntax-0.59.0.crate https://crates.io/api/v1/crates/term/0.4.5/download -> term-0.4.5.crate https://crates.io/api/v1/crates/thread-id/3.1.0/download -> thread-id-3.1.0.crate https://crates.io/api/v1/crates/thread_local/0.3.3/download -> thread_local-0.3.3.crate https://crates.io/api/v1/crates/toml/0.4.1/download -> toml-0.4.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.0/download -> unicode-segmentation-1.2.0.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/0.1.1/download -> unreachable-0.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
+_eclasses_=cargo	959846e2836f8244430c9582dd6493af	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=11e063e6ef6c1bbc9f53047fcc5cf7da
diff --git a/metadata/md5-cache/dev-util/shadowman-2 b/metadata/md5-cache/dev-util/shadowman-2
index de152bdbbb3d..d087d697b973 100644
--- a/metadata/md5-cache/dev-util/shadowman-2
+++ b/metadata/md5-cache/dev-util/shadowman-2
@@ -3,9 +3,9 @@ DEPEND=app-admin/eselect
 DESCRIPTION=Unified compiler shadow link directory updater
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/shadowman
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/mgorny/shadowman/archive/v2.tar.gz -> shadowman-2.tar.gz
-_md5_=e78a43a7b51646901b3fff004566bd86
+_md5_=9c1383d28ac401a4279d62618b94b96d
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 11456aa4a621..f429219e0867 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/git-2.13.6 b/metadata/md5-cache/dev-vcs/git-2.13.6
deleted file mode 100644
index 59d359f8ed3a..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.13.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.13.6.tar.xz mirror://kernel/software/scm/git/git-manpages-2.13.6.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.13.6.tar.xz )
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e972d7302fd7a42dc9994462e74e630e
diff --git a/metadata/md5-cache/dev-vcs/git-2.14.3 b/metadata/md5-cache/dev-vcs/git-2.14.3
deleted file mode 100644
index c386d5a3ea68..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.14.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.14.3.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.14.3.tar.xz )
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4d1608c88685dc5a7c82b4c9fa2da8ee
diff --git a/metadata/md5-cache/dev-vcs/git-2.15.1 b/metadata/md5-cache/dev-vcs/git-2.15.1
deleted file mode 100644
index 15ba3218970d..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.15.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.15.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.15.1.tar.xz )
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=57ff4052aeca5bba26de0a2bc8408f5c
diff --git a/metadata/md5-cache/dev-vcs/git-2.16.0 b/metadata/md5-cache/dev-vcs/git-2.16.0
deleted file mode 100644
index c0bee2b449cb..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.16.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.0.tar.xz )
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=57ff4052aeca5bba26de0a2bc8408f5c
diff --git a/metadata/md5-cache/dev-vcs/git-2.16.1 b/metadata/md5-cache/dev-vcs/git-2.16.1
index 337b9b36fb0e..749f84b1346b 100644
--- a/metadata/md5-cache/dev-vcs/git-2.16.1
+++ b/metadata/md5-cache/dev-vcs/git-2.16.1
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~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-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.16.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.1.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c7e982a04f6bed8b2f6a14541100b13
+_md5_=4a2a21b4394e38bd1bf307c4a87531fa
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.5.2 b/metadata/md5-cache/dev-vcs/mercurial-4.5.2
index 711e20a9114b..0bdda7495c9b 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.5.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.5.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.5.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d14859a889986f4de1d1c809e8a509b
+_md5_=ce0e33516a2d8a1d12e6a1f41b835ab3
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1 b/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
index 0dfe37a5f095..8b9680d47a1d 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
 EAPI=6
 HOMEPAGE=https://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~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 ~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=Subversion GPL-2
 RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.9.7.tar.bz2 https://dev.gentoo.org/~mgorny/dist/subversion-1.8.18-patchset.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43d80ecea98d3c2a6576c955209bb444
+_md5_=a17d7f330d998fa3f63543ff71e8f05d
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index 7524e20b088d..dda530e95a65 100644
Binary files a/metadata/md5-cache/gnustep-apps/Manifest.gz and b/metadata/md5-cache/gnustep-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9 b/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r1
similarity index 94%
rename from metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9
rename to metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r1
index 19914408c7ba..20ec4d4d87a7 100644
--- a/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9
+++ b/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9.tar.gz
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9a.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b1cbb5c7bba4af364cd9f274c9aa7c9
+_md5_=99a1cb62ba6e917adb87e761dedfd737
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index eb8b634b9fa1..5d99460c1905 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/ark-17.12.3 b/metadata/md5-cache/kde-apps/ark-17.12.3
index 693a19904b03..5088bd93a3c2 100644
--- a/metadata/md5-cache/kde-apps/ark-17.12.3
+++ b/metadata/md5-cache/kde-apps/ark-17.12.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext 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.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext 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.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Archiving tool
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
-IUSE=bzip2 lzma zip zlib test debug +handbook test
+IUSE=bzip2 lzma zip test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.3/src/ark-17.12.3.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2aead06fe85a6b66f44eeebd312af7a
+_md5_=21740169a02ec651e415725830982aa7
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 8ef7d5d5e009..65b71e261645 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.40.0 b/metadata/md5-cache/kde-frameworks/attica-5.40.0
deleted file mode 100644
index fe2f3daeeca1..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/attica-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7fa6614f4c3543cf1a2423e3b527f703
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.43.0 b/metadata/md5-cache/kde-frameworks/attica-5.43.0
index b4cdb76f4744..cde65d726c73 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing access to Open Collaboration Services
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/attica-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=272d4128912609ff1bcd1905e9ab28f3
+_md5_=a5c50eeedf02087a24bf4f22c17f5609
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.40.0 b/metadata/md5-cache/kde-frameworks/baloo-5.40.0
deleted file mode 100644
index 28d2d446ff74..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kfilemetadata-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kidletime-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kfilemetadata-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kidletime-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/baloo-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c987a3fe39961d7938a564d22355d9b
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.43.0 b/metadata/md5-cache/kde-frameworks/baloo-5.43.0
index c879bba36753..d721e3e84485 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for searching and managing metadata
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kfilemetadata-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kidletime-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/solid-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/baloo-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9b8077a67c432cf8490d98bdd92f2e2
+_md5_=8261ac2ddf11389e001fd9a426cf4055
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.40.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.40.0
deleted file mode 100644
index 556e82427038..000000000000
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=Qt wrapper for Bluez 5 DBus API
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/bluez-qt-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d38786cc06e32663f6acb0d11a4dddc
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.43.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.43.0
index d9cc4bfacece..c64f1ec1bbc8 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Qt wrapper for Bluez 5 DBus API
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/bluez-qt-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c56161d95ba41891363e8e9a5fa8cc78
+_md5_=b9652fe9b29a726d59d2ae7c1dd76aa9
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.40.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.40.0
deleted file mode 100644
index 29728033f80c..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.40.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.40:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze SVG icon theme
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-3
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/breeze-icons-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=12cd99720a0b5fde53e5437426a1b6b8
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.43.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.43.0
index 1c3769993a7b..297a41c901bc 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.43.0
@@ -4,9 +4,9 @@ DESCRIPTION=Breeze SVG icon theme
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-3
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/breeze-icons-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=17f0add66b425821672ea72242eae400
+_md5_=100c6d2fe8595cf00d491f56f8c81b14
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.40.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.40.0
deleted file mode 100644
index 77113b64110f..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.40.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.40:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze SVG icon theme binary resource
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/breeze-icons-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f77a430eaaf55a2335715c9c4b6f691
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.43.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.43.0
index 746bb3893f9d..67adb289f47c 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.43.0
@@ -4,9 +4,9 @@ DESCRIPTION=Breeze SVG icon theme binary resource
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/breeze-icons-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b671feb97e59218633840d7c85ec2cb
+_md5_=55138925e6820479faf2e46678b43d1b
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.40.0-r1 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.40.0-r1
deleted file mode 100644
index 3ffbc23dc0d7..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.40.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
-IUSE=doc test
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=app-arch/libarchive[bzip2]
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/extra-cmake-modules-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=741708726b584a0fac550220a9ce1e24
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.43.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.43.0
index fd73f86edc65..7b37eb80f589 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extra modules and scripts for CMake
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
 IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/extra-cmake-modules-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8f56501b3a9a8cec976dd22334c43f82
+_md5_=00fb029824d31a2c8655de15a071ea34
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.40.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.40.0
deleted file mode 100644
index b66cebb83ac3..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/knewstuff-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) 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.40: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=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/knewstuff-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/frameworkintegration-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fabe2500a8e7f78aeac7faa32df21ba4
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.43.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.43.0
index 5430655d1a49..06d978283eb9 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=appstream X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/knewstuff-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kpackage-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/frameworkintegration-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f1f403c964b89e911af28ff738c6383
+_md5_=23a028ff2db0886e5a931e2fc6c10d8b
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.40.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.40.0
deleted file mode 100644
index 76f350dbb34d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-libs/boost-1.54 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for working with KDE activities
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kactivities-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=238998429b6cfe775363d6379ace32f2
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.43.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.43.0
index b4b7790a0169..76af53f426e3 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for working with KDE activities
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kactivities-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82cae55a50b20bae514b9aaa04cdbf21
+_md5_=bb2c03e141000ba98aeeca5c0cff7bdf
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.40.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.40.0
deleted file mode 100644
index 7708906c071d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=dev-libs/boost-1.54 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for getting the usage statistics collected by the activities service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kactivities-stats-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=087279d7302741529f5c190c70ef29cf
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.43.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.43.0
index 09bb170e31ba..be5cadcce3cd 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for getting the usage statistics collected by the activiti
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kactivities-stats-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b2ddec7aa68aeebcc57c2a0ebfd14059
+_md5_=ef2e6406a19e564b01928504fb9a67dd
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.40.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.40.0
deleted file mode 100644
index 545ab6aa2148..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils 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(+)]
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen dev-python/jinja[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/pyyaml[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(+)] media-gfx/graphviz[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(+)] doc? ( >=dev-qt/qt-docs-5.7.1:5 ) 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_targets_python2_7
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kapidox-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3082b324629c59333c029b3a84c997a6
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.43.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.43.0
index 789345416ef8..52def27fe82b 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for building KDE API documentation in a standard format an
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=app-doc/doxygen dev-python/jinja[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/pyyaml[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(+)] media-gfx/graphviz[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(+)] doc? ( >=dev-qt/qt-docs-5.7.1:5 ) 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_targets_python2_7
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kapidox-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ee816bab864f6aaa71d809765351e6d7
+_md5_=5a7da2e3fc6054869382aa14ef8aebbc
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.40.0 b/metadata/md5-cache/kde-frameworks/karchive-5.40.0
deleted file mode 100644
index dc6421f99a8c..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+bzip2 +lzma debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/karchive-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27cb43db29f708ff70f58546dd532976
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.43.0 b/metadata/md5-cache/kde-frameworks/karchive-5.43.0
index c0682315eadf..18b3317a1a3a 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for reading, creation, and manipulation of various archive
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+bzip2 +lzma debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/karchive-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6162f648bb031423a41318b073d1161b
+_md5_=b8b2407fde7706febf453dd75a0ed8b8
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.40.0 b/metadata/md5-cache/kde-frameworks/kauth-5.40.0
deleted file mode 100644
index f802655460b3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls +policykit test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kauth-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=08f9172b70c66382f098e9e56520010c
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.43.0 b/metadata/md5-cache/kde-frameworks/kauth-5.43.0
index d3d2f815bc82..4c03e7618bfd 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework to let applications perform actions as a privileged user
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls +policykit test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kauth-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe50ece8f6beeafc36c9c61e5270309b
+_md5_=73aec7d0dd4e0f9430e944cf39801b73
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.40.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.40.0
deleted file mode 100644
index 67e4d8a3a936..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kconfigwidgets-5.40:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kbookmarks-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2bdd13d90b30034abd1a42866ef1d8ef
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.43.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.43.0
index 29cdcee90bbb..769c9f5d0b21 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for managing bookmarks stored in XBEL format
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kbookmarks-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=926c456bc2cbb34aab6679a18f2ed263
+_md5_=6d9dbcf9e9e96581daa29a19e7163fa7
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.40.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.40.0
deleted file mode 100644
index 3493217f225b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdeclarative-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdeclarative-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kcmutils-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fdbe12941d64da15665840ca0111619c
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.43.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.43.0
index bf5def69f844..3912dc0ad473 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework to work with KDE System Settings modules
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdeclarative-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kcmutils-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6574dc65babe4d2e33ab65354d2c20ea
+_md5_=ff884ea67a4764e834dd9ecf30ef1260
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.40.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.40.0
deleted file mode 100644
index 010ccf852f9e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kcodecs-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1881a8dfd2ba56eb0bd117f214c41597
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.43.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.43.0
index 963deff8f0cf..ca9b42dfd097 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for manipulating strings using various encodings
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kcodecs-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=378da3e62daa508a021c2de45333d588
+_md5_=38be192a23b2c7272e68407da2b8bc8d
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.40.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.40.0
deleted file mode 100644
index 8676db1a655a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kcompletion-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c54a4ed6725a7fdec26510c20a222a7
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.43.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.43.0
index b1963c89f999..0dc46e426d7c 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for common completion tasks such as filename or URL comple
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kcompletion-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4347ba04c17e9850ba88833444f285b7
+_md5_=fa6dcd0eb98361cf357429d74f650935
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.40.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.40.0
deleted file mode 100644
index 30f0a5328121..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kconfig-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca8a31b59b57350fe0f01e52800658fe
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.43.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.43.0
index dc6d944af065..99b20e56231b 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for reading and writing configuration
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kconfig-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=89fbfaff3a52eb554c80a85c9c3c210a
+_md5_=a8aca26c93288664256f35954215b876
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.40.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.40.0
deleted file mode 100644
index 2df4ba0de215..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.40:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kconfigwidgets-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f8a06a2547f374edfcbfa06e3af9906
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.43.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.43.0
index 750de461efdc..61ba2b89f35b 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing an assortment of configuration-related widgets
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+man test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kconfigwidgets-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=834fdfa0193b33716aa57c0a101ec642
+_md5_=583c03061bbd0151c34341efb41ced25
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.40.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.40.0
deleted file mode 100644
index 519f4617ea8f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) x11-misc/shared-mime-info nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=fam nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kcoreaddons-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bdac0bab9cada1645284f2fd9dd908c7
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.43.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.43.0
index 1db438d499a9..099a68424fa9 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for solving common problems such as caching, randomisation
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=fam nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kcoreaddons-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3ba2cc372c57a11be136c3a842492075
+_md5_=3d9a93a2ade3cfd0747edf984ef4c840
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.40.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.40.0
deleted file mode 100644
index 317a7f9c5f48..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-proto/xproto nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtwidgets-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kcrash-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27b8d078635b9b48f8677fe7cbcac0e9
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.43.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.43.0
index 82985eaf406b..8ec34ffe4a82 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for intercepting and handling application crashes
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kcrash-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23ffaa3864e6e7bbdbc06d91cd5f400f
+_md5_=49484d9ab8aa912405941ae3a35f7bee
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.40.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.40.0
deleted file mode 100644
index a6854b8842da..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for registering services and applications per freedesktop standards
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kdbusaddons-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc0dc2aafbfdf6e796f450cc5746db65
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.43.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.43.0
index 1c4539afb002..1eefdea00150 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for registering services and applications per freedesktop
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kdbusaddons-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f4e636614f777f3c2fbb33761d2d4ff
+_md5_=d1e27c7e9700695fa6f11e900a76e500
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.40.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.40.0
deleted file mode 100644
index 59dcac414f84..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kdeclarative-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=788246ff5295c82893f3acc04a1eaaad
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.43.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.43.0
index 7b3c848ec457..00e4c0f21942 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing integration of QML and KDE work spaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kpackage-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kdeclarative-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=367f52e720c52fa38b1994ecf207c2e9
+_md5_=fa2be2b16d29ecccb62e42161aebdd2b
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.40.0-r1 b/metadata/md5-cache/kde-frameworks/kded-5.40.0-r1
deleted file mode 100644
index ab2e033825eb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.40.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kinit-5.40:5 >=kde-frameworks/kservice-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.40:5 ) 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.40:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kinit-5.40:5 >=kde-frameworks/kservice-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kded-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31e6d1ac0c862acd61ddb271691a8dda
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.43.0 b/metadata/md5-cache/kde-frameworks/kded-5.43.0
index 63f4552c3509..4eed8e2cfabf 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Central daemon of KDE workspaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kinit-5.43:5 >=kde-frameworks/kservice-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kded-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d18366b668bf05e5736e0ccebd0cf63
+_md5_=374eae1b98b27201c1f584424c6d68c9
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.40.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.40.0
deleted file mode 100644
index 1794d9d3cbf2..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kded-5.40:5 >=kde-frameworks/kdesignerplugin-5.40:5 >=kde-frameworks/kemoticons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kunitconversion-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.40:5 >=dev-qt/designer-5.7.1:5 dev-lang/perl dev-perl/URI test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) X? ( 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.40: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=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libressl X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kded-5.40:5 >=kde-frameworks/kdesignerplugin-5.40:5 >=kde-frameworks/kemoticons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kunitconversion-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.40:5 >=kde-frameworks/kinit-5.40:5 >=kde-frameworks/kitemmodels-5.40:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/kde4-l10n-16.04.3 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/kdelibs4support-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=995bb2b6bc9644388d4d65e53d0f0210
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.43.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.43.0
index fe03140bc85b..0dced22270e7 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kded-5.43:5 >=kde-frameworks/kdesignerplugin-5.43:5 >=kde-frameworks/kemoticons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kunitconversion-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/solid-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.43:5 >=kde-frameworks/kinit-5.43:5 >=kde-frameworks/kitemmodels-5.43:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/kdelibs4support-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=49261df9484eb84af92612a7491e04e1
+_md5_=a7aaa3d2f5f28ad595649661caf942c6
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.40.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.40.0
deleted file mode 100644
index 74c0db87792a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kplotting-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.40:5 ) >=kde-frameworks/kdoctools-5.40:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=designer nls webkit debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kplotting-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.40:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kdesignerplugin-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9eb14e11b883abcecce8c031e92bda04
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.43.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.43.0
index 862c1aa89c76..6978fbecac46 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesig
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=designer nls webkit debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kplotting-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/sonnet-5.43:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.43:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kdesignerplugin-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3009839ebc22f6a6bae366fffbd7431e
+_md5_=b738def363c26cbd37ea5dcec38672c6
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.40.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.40.0
deleted file mode 100644
index 2ee4cbee3686..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kpty-5.40:5 >=kde-frameworks/kservice-5.40:5 X? ( x11-libs/libX11 ) X? ( x11-proto/xproto ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to handle super user actions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kpty-5.40:5 >=kde-frameworks/kservice-5.40:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kdesu-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06e5484db9793488b148f7736a7d09ba
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.43.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.43.0
index cb75ab00ab25..ad96eba01104 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework to handle super user actions
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kpty-5.43:5 >=kde-frameworks/kservice-5.43:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kdesu-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d9d855e5e6843f15ea3ddce4c749b31
+_md5_=0c1e0fbf8f178239e85222db65ae36c0
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.40.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.40.0
deleted file mode 100644
index d4bcba8871f5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwallet-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 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.40:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing KDE integration of QtWebKit
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwallet-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kdewebkit-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=009262bb1a9d925f458a4889bdc24203
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.43.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.43.0
index 7ee5ad46ae09..5c4fc6a5c158 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing KDE integration of QtWebKit
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwallet-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kdewebkit-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6495c0bb2421c1d46acbc29cf9903f3e
+_md5_=d2affb345e3bd2268482dc4d71e43198
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.40.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.40.0
deleted file mode 100644
index 611c0c174b12..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for network service discovery using Zeroconf
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls zeroconf debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kdnssd-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c1af5e2444e60c2723f75b991417cc73
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.43.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.43.0
index 2e480af261a6..9732b6eff60b 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for network service discovery using Zeroconf
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls zeroconf debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kdnssd-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b67e5dd15c0ab39f99031131c64e63cf
+_md5_=c91de21e64cc84a1291b2b6fc03cd82b
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.40.0-r1 b/metadata/md5-cache/kde-frameworks/kdoctools-5.40.0-r1
deleted file mode 100644
index 5887b20b5c89..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.40.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt dev-lang/perl dev-perl/URI 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.40: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=Tools to generate documentation in various formats from DocBook files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/karchive-5.40:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kdoctools-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=72ce06ecf5a0f9d7eed1602165f8de6a
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.43.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.43.0
index 98c4c16b5a5d..4dde92ead025 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tools to generate documentation in various formats from DocBook file
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.43:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kdoctools-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05683a71c581dcfae46ddbcb15c3e22a
+_md5_=dbe05b42041ca360f4046f227edb71fd
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.40.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.40.0
deleted file mode 100644
index f34ec44b1eca..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kservice-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kservice-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kemoticons-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=89c258dcbae138ab61178cfa6378525c
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.43.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.43.0
index b06588f27ddd..d8c494040b1d 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for converting text emoticons to graphical representations
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kservice-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kemoticons-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=13039e88219306a131435b9ae69930ff
+_md5_=a0623008271cb2545cf54ff530f15619
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.40.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.40.0
deleted file mode 100644
index 8b22fd2f18ea..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.40:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) !taglib? ( >=dev-qt/qtmultimedia-5.7.1:5 ) kernel_linux? ( sys-apps/attr ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for extracting file metadata
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=epub exif ffmpeg libav office pdf taglib debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.40:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) !taglib? ( >=dev-qt/qtmultimedia-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-REQUIRED_USE=test? ( taglib )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kfilemetadata-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56d64a770a6f0a32d761e4dba0eb2648
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.43.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.43.0
index 23d5b669eeb8..ca6426ffff13 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for extracting file metadata
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=epub exif ffmpeg libav office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/ki18n-5.43:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.43:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kfilemetadata-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d3cbbda68e09d4b51fbd8c8bb93456d7
+_md5_=4ec5f96e686c0b66ad61a9dc2c22ede7
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.40.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.40.0
deleted file mode 100644
index b176514603c8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kglobalaccel-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d756bf4771aef2bf144290c93d20c907
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.43.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.43.0
index cb009df929b6..79ebcb0139d6 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework to handle global shortcuts
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kglobalaccel-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6e15eae3a51ac1c5b30f9a9de24b553
+_md5_=073d3331056004a10834a8a7b9f66a5f
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.40.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.40.0
deleted file mode 100644
index 7f21bafe809e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kguiaddons-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=213236a92070a0e990ffbd22390336ae
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.43.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.43.0
index ccaf8c10083f..d1d12a57a5f7 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing assorted high-level user interface components
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kguiaddons-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d97dc002c9735397704d6d5d64fd6686
+_md5_=52d4a9fd47a69959272f963957349caa
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.43.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.43.0
index 7e818fe8b37f..b2459c079cff 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library to determine holidays and other special events for a geograp
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kholidays-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0fd5f358beb7af39243799c0b063bcf7
+_md5_=fe0b428fa5c51099ef6eff8144397143
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.40.0 b/metadata/md5-cache/kde-frameworks/khtml-5.40.0
deleted file mode 100644
index 26ddfd1501f8..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.40.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.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kjs-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwallet-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) dev-lang/perl dev-util/gperf test? ( >=dev-qt/qtx11extras-5.7.1:5 ) X? ( 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.40: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=KHTML web rendering engine
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libressl X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kjs-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwallet-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/khtml-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=553edbca3e49a5580075cd0bff77d310
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.43.0 b/metadata/md5-cache/kde-frameworks/khtml-5.43.0
index dea6359e1e09..8d493553b0f2 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=KHTML web rendering engine
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kjs-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwallet-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/sonnet-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/khtml-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa309a608a18ca622b5a3eaeb98bb729
+_md5_=05b5f65172268e5328129f36aaf57b65
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.40.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.40.0
deleted file mode 100644
index a4576d0b758e..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test 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=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=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(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-REQUIRED_USE=^^ ( 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=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/ki18n-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b316c2c33c6370973e8dd697cbabd780
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.43.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.43.0
index 63a2e0822dfd..708db7bf1a62 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework based on Gettext for internationalizing user interface tex
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test 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=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=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(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 REQUIRED_USE=^^ ( 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=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/ki18n-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9779ea95c907add1105106b8032c20cc
+_md5_=5e62447e9388e1d19582db4f27a0cb4e
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.40.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.40.0
deleted file mode 100644
index b4c567407683..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kiconthemes-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a6685e886bd360a80670ff5a28dea7f
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.43.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.43.0
index f3be5d6076c3..dbb88270a280 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for icon theming and configuration
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kiconthemes-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f948676d4a0e93e4cd834e8b1d2df661
+_md5_=0ff71258ea01de844c4416a5d02885b2
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.40.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.40.0
deleted file mode 100644
index 1051d6356557..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X xscreensaver debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kidletime-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=406128436ca36875ad07b347da9d56c3
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.43.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.43.0
index 62db1eacd62f..be6023a5b24d 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for detection and notification of device idle time
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=X xscreensaver debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kidletime-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3001b01746d7369d1b12cf0596d6215
+_md5_=eee535bbb8e0998d21df992504be1fe3
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.40.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.40.0
deleted file mode 100644
index a7b0a59586f3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.40.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.40:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) 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.40: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=Framework providing additional format plugins for Qt's image I/O system
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=eps openexr test debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kimageformats-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e25b7fbdaa19ea539ff24e9d46f936c
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.43.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.43.0
index 0a9544272ce4..8c5a52406600 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing additional format plugins for Qt's image I/O sys
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=eps openexr test debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.43:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kimageformats-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=986fc7cf5619b3016589226c12949e08
+_md5_=847087cef0fbfd9cce1fc0ab62b933bd
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.40.0 b/metadata/md5-cache/kde-frameworks/kinit-5.40.0
deleted file mode 100644
index a57a5211588e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) man? ( >=kde-frameworks/kdoctools-5.40:5 ) X? ( x11-proto/xproto ) 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.40:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+caps +man X debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kinit-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c30da30c4121c5e254d86ba646059a4
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.43.0 b/metadata/md5-cache/kde-frameworks/kinit-5.43.0
index 68590f20bd8b..ab8ace3cdaf2 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kinit-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5871a7371fc62257fa8a05089bca2398
+_md5_=ca0550a4d18af8b3d62d7fdf01904f13
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.40.0-r3 b/metadata/md5-cache/kde-frameworks/kio-5.40.0-r3
deleted file mode 100644
index d68934ccc5ad..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.40.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kbookmarks-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.40:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=dev-qt/qtconcurrent-5.7.1:5 handbook? ( >=kde-frameworks/kdoctools-5.40:5 ) test? ( sys-libs/zlib ) X? ( x11-libs/libX11 x11-libs/libXrender 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=acl +handbook kerberos +kwallet X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.40:5
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kbookmarks-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.40:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kio-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c783030fdb30162413af7ae1ea6d319
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.43.0-r1 b/metadata/md5-cache/kde-frameworks/kio-5.43.0-r1
index 68a6ab6d479a..943ad7d35c0a 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.43.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kio-5.43.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Framework providing transparent file and data management
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=acl +handbook kerberos +kwallet X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 PDEPEND=>=kde-frameworks/kded-5.43:5
 RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kbookmarks-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/solid-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.43:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.43:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kio-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79024c0d673daae13e8b0eb2c473c1b5
+_md5_=06e7669dd7120cd995d59ed6fb0ac5ce
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.40.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.40.0
deleted file mode 100644
index bce6f0149c3d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-5.40:5 ) >=dev-qt/linguist-tools-5.7.1:5 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.40: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=Lightweight user interface framework for mobile and convergent applications
-EAPI=6
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=plasma debug examples test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-5.40:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kirigami2-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=efab4227342f02f481d2ae544ac6f40b
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.43.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.43.0
index fc927acdc7f7..35cefb1d4e3f 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight user interface framework for mobile and convergent appli
 EAPI=6
 HOMEPAGE=https://techbase.kde.org/Kirigami
 IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kirigami2-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=101964156fd7da96d8aaad2cf5531ae7
+_md5_=d664e9b8c8d84e7f47552be2afcc6152
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.40.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.40.0
deleted file mode 100644
index 2ae56f7119d6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( >=dev-qt/qtwidgets-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kitemmodels-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=819210a72b7ce78fcc24816246e1eca4
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.43.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.43.0
index 0499697f3cdb..6f8077b0c78d 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing data models to help with tasks such as sorting a
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kitemmodels-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b5029d136591559f64bc120f87a932b
+_md5_=9b4b355f8d91c83c6bd5c9c51f2e9e07
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.40.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.40.0
deleted file mode 100644
index aa9118997ce7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kitemviews-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05801dcb37f397f2b5dbb19971bc55c2
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.43.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.43.0
index a5e22472f7f2..1ab29e078c4a 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing additional widgets for item models
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kitemviews-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df6df54cdad36b07e198ea497615813e
+_md5_=0d2a5dda6174882c33cf2e8a7857942a
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.40.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.40.0
deleted file mode 100644
index 1f009cfd5c83..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-libs/libX11 x11-proto/xproto ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kjobwidgets-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=981441fb8da29eff0320a5df516d6884
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.43.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.43.0
index 42f1719ff025..f5b2ceb4b06c 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing assorted widgets for showing the progress of job
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kjobwidgets-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ceb7f4fe9821bda5f4d2fb3eb6ee05a
+_md5_=8514b423c3fc2bbe53cf05ba999308bf
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.40.0 b/metadata/md5-cache/kde-frameworks/kjs-5.40.0
deleted file mode 100644
index 72c736574618..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libpcre >=kde-frameworks/kdoctools-5.40:5 dev-lang/perl 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.40: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=ECMAScipt compatible parser and engine
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/kjs-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b9277a5a6c0ec724705cfbcbe0e7f7f8
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.43.0 b/metadata/md5-cache/kde-frameworks/kjs-5.43.0
index 916906567fb1..8f41a5c45f4f 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=ECMAScipt compatible parser and engine
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/kjs-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=81ce71e8a02e918a6a0f8ba9f543ad5d
+_md5_=90e15957c5d0cd4cc3f7a2fd5da15445
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.40.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.40.0
deleted file mode 100644
index 156ca4db7f7f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kjs-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.40:5 >=dev-qt/designer-5.7.1:5 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.40:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework binding JavaScript objects to QObjects
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kjs-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/kjsembed-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1cf63cbc85a922af0f12946b4d006e4b
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.43.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.43.0
index 88a13eeebfea..d0a3f971564e 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework binding JavaScript objects to QObjects
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kjs-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/kjsembed-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0a3ee0e99ad67b6eee24cdcc04816c71
+_md5_=30e1f1a9d0acd3ec304bdfc7bd218c7a
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.40.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.40.0
deleted file mode 100644
index fe5b05d4d86b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 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.40: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=Framework providing a common interface for KParts that can play media files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/kmediaplayer-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82b66f7a856440a1e620387a532056b8
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.43.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.43.0
index 4b94504d222f..ac7355720b5b 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing a common interface for KParts that can play medi
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/kmediaplayer-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4efa5c076abee87bedc1b748e3053551
+_md5_=9627bef6f942114571e08d337aaf5703
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.40.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.40.0
deleted file mode 100644
index 77e61d4a15a3..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.40:5 >=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/attica-5.40:5 >=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kirigami-5.40:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/knewstuff-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=46ef6da2a0bb68289242108b3be1ca9c
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.43.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.43.0
index 9979d44cacad..83551defbde1 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for downloading and sharing additional application data
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.43:5 >=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kirigami-5.43:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/knewstuff-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dcf9fd98c448de261ca8933f47ad2d6a
+_md5_=86a85a82b09406bc05e3deba47ebd325
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.40.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.40.0
deleted file mode 100644
index 5266774ca520..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for notifying the user of an event
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=dbus nls speech X debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/knotifications-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=95a21c62a37f5b31a5a71c71390800d6
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.43.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.43.0
index ed113b9ece5e..02ed7ba79b30 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for notifying the user of an event
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=dbus nls speech X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/knotifications-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce3312b5fb6482147de5241990e4c11c
+_md5_=30ec8381afe3c67a37820a9d3fd2f2e6
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.40.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.40.0
deleted file mode 100644
index f1a160b09f0f..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=phonon debug doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/knotifyconfig-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b6f0fe8d7d3fc0800700228acde5cb6
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.43.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.43.0
index cb2718d2720a..6f92037c2df0 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for configuring desktop notifications
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/knotifyconfig-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f58337ebde2970d4c869483a52b0f5d9
+_md5_=68996a23aae0b601e2e9d597b8b64511
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.40.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.40.0
deleted file mode 100644
index f35ed3a9abff..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.40.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.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 man? ( >=kde-frameworks/kdoctools-5.40:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kpackage-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0bd934036f91db775cb2e0d5e2f0a4f3
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.43.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.43.0
index 5d08a58d557d..1bc592cd65e6 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework to install and load packages of non binary content
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kpackage-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24bfe4fb28b8685ce67ac46ee5ff58a5
+_md5_=55bafc07cb09edcbb61a946e97dfd3da
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.44.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.44.0
index f1b014b893ca..94e205378cb2 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.44.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.44.0
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/karchive-5.44:5 >=kde-frameworks/kcoreaddons-5.44:5 >=k
 SLOT=5/5.44
 SRC_URI=mirror://kde/stable/frameworks/5.44/kpackage-5.44.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24bfe4fb28b8685ce67ac46ee5ff58a5
+_md5_=f586e2cef6b50a8b0844a1cff067b388
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.40.0 b/metadata/md5-cache/kde-frameworks/kparts-5.40.0
deleted file mode 100644
index 7ec808a4b2d4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/ktextwidgets-5.40:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kparts-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=25abf8cc483cf2987ff1176c5c7ae916
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.43.0 b/metadata/md5-cache/kde-frameworks/kparts-5.43.0
index d509719e5534..282400f4b78b 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing elaborate user-interface components
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kparts-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f577175f51edf0e6fbd6ac8abb4422b1
+_md5_=04bf6d8033f2178684897d4380482ab5
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.40.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.40.0
deleted file mode 100644
index e21f782f428a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE contact person abstraction library
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kpeople.git
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kpeople-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3b56718af4afc7fcd8c8adb3b0e35543
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.43.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.43.0
index 103c269ce683..98bee11cf340 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE contact person abstraction library
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kpeople.git
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kpeople-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76d9365d1f09489bea1598e7e1969f1a
+_md5_=7297d37bc635c52c6873188b433d9e14
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.40.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.40.0
deleted file mode 100644
index 6a151cc87a7c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing easy data-plotting functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kplotting-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=efcc6bc489e0e9b6bc9b2d0010f550df
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.43.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.43.0
index 1a4b9ec5c8e5..6cea2eb6b52c 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing easy data-plotting functions
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kplotting-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=930c75e3328e1cb8986e561664a8e618
+_md5_=b738744ad22daa36ae762c204bcb7c5a
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.40.0 b/metadata/md5-cache/kde-frameworks/kpty-5.40.0
deleted file mode 100644
index 68ba22357fc3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 sys-libs/libutempter 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kpty-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=428d346bcc1aadbfef57019ad904b7b7
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.43.0 b/metadata/md5-cache/kde-frameworks/kpty-5.43.0
index 90e78a8ccc84..6e979fe84b68 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for pseudo terminal devices and running child processes
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kpty-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=20f7a6cd39ac8c27e3f4d21c0b437450
+_md5_=14ec178de06155ed00de72085ee334c2
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.40.0 b/metadata/md5-cache/kde-frameworks/kross-5.40.0
deleted file mode 100644
index a3412f5269ef..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.40:5 >=dev-qt/designer-5.7.1:5 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.40: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=Framework for embedding scripting into applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/kross-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=630093845b227c158d633e3a670a1155
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.43.0 b/metadata/md5-cache/kde-frameworks/kross-5.43.0
index 00d300101fa2..60d439fcab84 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for embedding scripting into applications
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/kross-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b71613570ce74be08b000a94c906052
+_md5_=604193dea2e1f1d18e4f38c7580bc9df
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.40.0 b/metadata/md5-cache/kde-frameworks/krunner-5.40.0
deleted file mode 100644
index d80bc8c46480..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/plasma-5.40:5 >=kde-frameworks/solid-5.40:5 >=kde-frameworks/threadweaver-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/plasma-5.40:5 >=kde-frameworks/solid-5.40:5 >=kde-frameworks/threadweaver-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kapptemplate-15.12.3-r1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/krunner-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=50aedb89a6ee24d3d039cb47df46f4c1
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.43.0 b/metadata/md5-cache/kde-frameworks/krunner-5.43.0
index 1bac7963e850..8f4bf062e3a0 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for providing different actions given a string query
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/plasma-5.43:5 >=kde-frameworks/solid-5.43:5 >=kde-frameworks/threadweaver-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/krunner-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e072d08ad99dcce618650c3171ffbc99
+_md5_=d53de54569c51264722f133bcd471a39
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.40.0 b/metadata/md5-cache/kde-frameworks/kservice-5.40.0
deleted file mode 100644
index 3acdcca259a8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.40:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kservice-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b85257623593909d047011752b2660d8
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.43.0 b/metadata/md5-cache/kde-frameworks/kservice-5.43.0
index 80e6d1836bbb..6d4177045028 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced plugin and service introspection
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2 LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kservice-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1255b02fd8e236b943893db5d2ce6ef
+_md5_=bfe8aaeae91de5af2cb80716d0e469d2
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.40.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.40.0
deleted file mode 100644
index fb9f8009fc6b..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=kde-frameworks/syntax-highlighting-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtxmlpatterns-5.7.1:5 test? ( >=kde-frameworks/kservice-5.40:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing a full text editor component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=editorconfig git test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=kde-frameworks/syntax-highlighting-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/ktexteditor-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d3a4b1ebc9401d03e490897b3d208888
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.43.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.43.0
index c23a33b69c37..af9b3b0fc7b7 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework providing a full text editor component
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/sonnet-5.43:5 >=kde-frameworks/syntax-highlighting-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/ktexteditor-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f30729c8ef0b9426cb8fe738d9e39b37
+_md5_=14feea925c1f1afa24823d31a0a5fe33
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.40.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.40.0
deleted file mode 100644
index 6e3b154bf0fe..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/ktextwidgets-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83cb5b8a615ae8cc6b8171bcb220fae4
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.43.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.43.0
index 5e54a4c18561..f77fb01d0586 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing an assortment of widgets for displaying and edit
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=speech test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/sonnet-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/ktextwidgets-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c8beff7f9dd6799faa5ec0d82ff2ab7
+_md5_=af1df9f90ba781008dcafa275ef90e31
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.40.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.40.0
deleted file mode 100644
index dd36ea89010d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for converting units
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kunitconversion-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aacccc7f9a62fccb72a707330423f44e
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.43.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.43.0
index 6250360193ec..8e7ee98f896d 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for converting units
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.43:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kunitconversion-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9e929dd914f69e47c3f7846070e055e
+_md5_=6403378b7f449ec097b02b350ad249a5
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.40.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.40.0
deleted file mode 100644
index b0255a07c4a0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) man? ( >=kde-frameworks/kdoctools-5.40:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=gpg +man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kwallet-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8bc88acf1c9c3dbcbf19206028acc453
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.43.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.43.0
index 4dc3fdc7acf9..a1fdd21a5845 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing desktop-wide storage for passwords
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kwallet-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f360dcfe404c371306515fe702d401ca
+_md5_=b024640560ab2279e22ff8061abf91c1
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.40.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.40.0
deleted file mode 100644
index fff825a88ef8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.7.0 media-libs/mesa[egl] 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kwayland.git
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.7.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.7.1:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kwayland-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2da8b30678d88b713eb093c20eed38ed
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.43.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.43.0
index 68408380727a..eaefe0420a47 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kwayland.git
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.7.1:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kwayland-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1399ddbc69f9a9500c90f8e33d457dc6
+_md5_=9692300eb957bcd1f7699d5b44cf761c
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.40.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.40.0
deleted file mode 100644
index 750682781dff..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kwidgetsaddons-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f94747fcb6b5dcecf74301eeafbb86bd
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.42.1 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.42.1
deleted file mode 100644
index 7efc40b76091..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.42.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kwidgetsaddons-5.42.1.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f60a3a1b79a05d61245a02c68af376fe
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.43.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.43.0
index 81bc4f0051c7..2b594ecefb10 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=An assortment of high-level widgets for common tasks
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kwidgetsaddons-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f60a3a1b79a05d61245a02c68af376fe
+_md5_=61c341bc75d466dbd902135a875c817c
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.44.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.44.0
index 0dfa6de76b7b..77b04ecbfb3e 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.44.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.44.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-en
 SLOT=5/5.44
 SRC_URI=mirror://kde/stable/frameworks/5.44/kwidgetsaddons-5.44.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f60a3a1b79a05d61245a02c68af376fe
+_md5_=9e7545ad957b5c067fcddf25a3eb9915
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.40.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.40.0
deleted file mode 100644
index 498d95879f39..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kwindowsystem-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=61188aad60dd227190e75dd2bdf49877
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.43.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.43.0
index e82011ab4e50..c6ed3a3646f9 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework providing access to properties and features of the window
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kwindowsystem-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ffbe0b37d9c4ce7bb607b5dc4eab77ce
+_md5_=22eff584eb8207c71012cd2129d4d068
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.40.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.40.0
deleted file mode 100644
index 4f8bbbce4cad..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.40:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=attica test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.40:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kxmlgui-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=95edcd9e10b22d8575ef4170c65dbc3d
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.43.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.43.0
index 7e559bb50c44..6dbaecf79a7e 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=attica test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.43:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kxmlgui-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9b8393232123ad095929f528dcc1105
+_md5_=6bb978df08ac41a7b4170680f81aa725
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.40.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.40.0
deleted file mode 100644
index 4e459a4e5434..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=dev-qt/qtxml-5.7.1:5 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/kxmlrpcclient-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=582fa1c9d3a2a871f6e9e8b973929fed
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.43.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.43.0
index 4c63fc5e7b5e..73c87f8b55d3 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/kxmlrpcclient-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=208fa3b6f20be2c9355fc68099887bfc
+_md5_=d8a68283a2786df61fd6cecf8bb24f33
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.40.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.40.0
deleted file mode 100644
index 68d92248572f..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager virtual/pkgconfig 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/modemmanager-qt-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8662bf0ba6d2608970cf87fd96c28415
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.43.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.43.0
index b8abcfc9ce9d..b7b79db1b0d7 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=ModemManager bindings for Qt
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/modemmanager-qt-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc321998618f4f378721f1a1ebcfb6ac
+_md5_=b68d80d33221836fe86d6592d317a559
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0-r1 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0-r1
deleted file mode 100644
index 12628a6bdadc..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) virtual/pkgconfig 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=teamd debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/networkmanager-qt-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2bd377cac1acb5f1b2f07b7977635e69
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.43.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.43.0
index 6b79ae6894c2..cc7b992f83fb 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager bindings for Qt
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/networkmanager-qt-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=679e0792d08c99645434029b55fdc61d
+_md5_=9b02e9850512b54bfb1a9c43e8a0a140
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.40.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.40.0
deleted file mode 100644
index 7cfdc1fa887b..000000000000
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.40:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Oxygen SVG icon theme
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/oxygen-icons5-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a273defef1556f8ba56794f4eeb01ab2
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.43.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.43.0
index 87c6c4f58326..b467bd433eec 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Oxygen SVG icon theme
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/oxygen-icons5-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d91700002f32b0d14db54bde5b3d00e4
+_md5_=d8ad8d51b8cdc4169342ad0f8201dd83
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.40.0 b/metadata/md5-cache/kde-frameworks/plasma-5.40.0
deleted file mode 100644
index 062911c6729d..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40:5 >=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdeclarative-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.40:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.40:5 X? ( 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma framework
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=gles2 wayland X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.40:5 >=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdeclarative-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.40:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/plasma-framework-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5515da310843ee430ef76ef5317c55ca
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.43.0 b/metadata/md5-cache/kde-frameworks/plasma-5.43.0
index 5e98ac292dec..02668e6e9ecb 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Plasma framework
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=gles2 wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kactivities-5.43:5 >=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdeclarative-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kirigami-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kpackage-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.43:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/plasma-framework-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=52602b73d9e255076db6ed292491878b
+_md5_=69f08c50504d45c02bbada6c9d49b4f6
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.40.0 b/metadata/md5-cache/kde-frameworks/prison-5.40.0
deleted file mode 100644
index 565b3779b4d6..000000000000
--- a/metadata/md5-cache/kde-frameworks/prison-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=QRCode and data matrix barcode library
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/prison.git
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/prison-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11f75cada3ecbeb71dcf8e0b707fea0b
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.43.0 b/metadata/md5-cache/kde-frameworks/prison-5.43.0
index a4586d131608..47a3cc4e9f67 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=QRCode and data matrix barcode library
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/prison.git
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/prison-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e0b11ed327a523b05e1b5bd0fff4788c
+_md5_=7c69754eaf2720ff1709032675adc807
diff --git a/metadata/md5-cache/kde-frameworks/purpose-1.2.1 b/metadata/md5-cache/kde-frameworks/purpose-1.2.1
deleted file mode 100644
index 248cd8adab4f..000000000000
--- a/metadata/md5-cache/kde-frameworks/purpose-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 net-libs/accounts-qt ) >=kde-frameworks/extra-cmake-modules-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+kaccounts debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* )
-RESTRICT=test
-SLOT=5/1.2
-SRC_URI=mirror://kde/stable/purpose/purpose-1.2.1.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3af3f9fc72e01e692f8781dd068ed5c3
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.43.0 b/metadata/md5-cache/kde-frameworks/purpose-5.43.0
index fe583933ff20..fa3a230acff6 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.43.0
@@ -4,11 +4,11 @@ DESCRIPTION=Library for providing abstractions to get the developer's purposes f
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=+kaccounts debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/purpose-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f093a18092da3812908b93e7190f2df
+_md5_=62203c07b848dd05ab4ab746bee455c0
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.40.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.40.0
deleted file mode 100644
index 9cd252ffe68d..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kirigami-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 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.40: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=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kirigami-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/qqc2-desktop-style-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4367b6828df8b6bd47ddb5e1ad75f017
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.43.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.43.0
index ca5224fa4496..55f98dd93a7f 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( GPL-2+ LGPL-3+ )
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kirigami-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/qqc2-desktop-style-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2568c27a224f73a206ff5459f020560b
+_md5_=e8e1e0027e960e523cac8e0e2176d0f7
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.40.0 b/metadata/md5-cache/kde-frameworks/solid-5.40.0
deleted file mode 100644
index c016958bb3c7..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/solid-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d771cdab1e2ecdb42536071243cce372
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.43.0 b/metadata/md5-cache/kde-frameworks/solid-5.43.0
index 578ca9943dd6..9b0cbed915a1 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Provider for platform independent hardware discovery, abstraction an
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/solid-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6c8590c6e2b388d359474a6f0c0f482c
+_md5_=5ee8f024e3b2b4c950dec21b4f366862
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.40.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.40.0
deleted file mode 100644
index f74f7294f514..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=aspell +hunspell nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/sonnet-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=81aebe4293424617943d6bd6f07180d0
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.43.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.43.0
index 121351087c85..f1ca045b87fb 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for providing spell-checking through abstraction of popula
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=aspell +hunspell nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/sonnet-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c97c2e7e52e71919526b811000495c2
+_md5_=88ec049d8122b9b203d102456a938b85
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.40.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.40.0
deleted file mode 100644
index 57d50a37bb24..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) 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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for syntax highlighting
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/syntax-highlighting-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4364b01f0e6e012eb1fac4e1a60f06aa
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.43.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.43.0
index 2b560f22f0c6..e58e8602ec6c 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for syntax highlighting
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/syntax-highlighting-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=686451df65c3fb0001e601d838eb9ecd
+_md5_=81019a335daade353d710977e45a7c4f
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.40.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.40.0
deleted file mode 100644
index 5fb2a1cb4181..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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.40:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.40
-SRC_URI=mirror://kde/stable/frameworks/5.40/threadweaver-5.40.0.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7e70da02a77f4550f64a77901a6deded
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.43.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.43.0
index bbffa30dd062..cef4fb03d06c 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.43.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.43.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for managing threads using job and queue-based interfaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.43
 SRC_URI=mirror://kde/stable/frameworks/5.43/threadweaver-5.43.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=49f13ae000e6a4f83cc62b324e4c5ae9
+_md5_=e8f0c5661f782189d36028bc04ccddbc
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 712041a2d878..bca0b54edfef 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/tellico-3.1 b/metadata/md5-cache/kde-misc/tellico-3.1
deleted file mode 100644
index a339003a7c2c..000000000000
--- a/metadata/md5-cache/kde-misc/tellico-3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-14.12.0:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-14.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) sys-devel/gettext 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.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.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=A collection manager based on KDE Frameworks
-EAPI=6
-HOMEPAGE=http://tellico-project.org/
-IUSE=cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-14.12.0:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-14.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) !kde-misc/tellico:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=http://tellico-project.org/files/tellico-3.1.tar.xz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e0e91d1a181e1006fe873d1f21db3f31
diff --git a/metadata/md5-cache/kde-misc/tellico-3.1.1 b/metadata/md5-cache/kde-misc/tellico-3.1.1
index e2d570d84a1c..1193e5e61d77 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.1.1
+++ b/metadata/md5-cache/kde-misc/tellico-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A collection manager based on KDE Frameworks
 EAPI=6
 HOMEPAGE=http://tellico-project.org/
 IUSE=cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-14.12.0:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-14.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) !kde-misc/tellico:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=http://tellico-project.org/files/tellico-3.1.1.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e35db1c68960013f271ee746b06bbec9
+_md5_=c5ff93407ec55e6ee7a68f881d8ac99f
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index e42e30b3d994..4aa8734d4acc 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.6.6 b/metadata/md5-cache/mail-filter/rspamd-1.6.6
new file mode 100644
index 000000000000..04e837c68f29
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/rspamd-1.6.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-util/ragel !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 <dev-util/ragel-7.0 sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
+DESCRIPTION=Rapid spam filtering system
+EAPI=6
+HOMEPAGE=https://github.com/vstakhov/rspamd
+IUSE=cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 <dev-util/ragel-7.0 sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+SLOT=0
+SRC_URI=https://github.com/vstakhov/rspamd/archive/1.6.6.tar.gz -> rspamd-1.6.6.tar.gz
+_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=41740706fb4d088532b839027a857cb1
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r20 b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r20
index 41e10ebd55bf..5582232e0e93 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r20
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r20
@@ -4,10 +4,10 @@ DESCRIPTION=An extensible mail filter which can identify and tag spam
 EAPI=6
 HOMEPAGE=https://spamassassin.apache.org/
 IUSE=berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.1.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9a87086bca40721078c70aabde7de7de
+_md5_=7ea756aa5704f936abb2a0929ad96ea9
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index fd79680f9444..01b80e4d9449 100644
Binary files a/metadata/md5-cache/mate-base/Manifest.gz and b/metadata/md5-cache/mate-base/Manifest.gz differ
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.18.2-r1 b/metadata/md5-cache/mate-base/mate-session-manager-1.18.2-r1
new file mode 100644
index 000000000000..4c7cf82f5510
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.18.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
+DESCRIPTION=MATE session manager
+EAPI=6
+HOMEPAGE=http://mate-desktop.org/
+IUSE=debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2 FDL-1.1
+RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-session-manager-1.18.2.tar.xz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be9a1a19ee420c8c825d70502640cc3a
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 7d9e9ff9544c..388f6ea20899 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/freecad-0.16.6712 b/metadata/md5-cache/media-gfx/freecad-0.16.6712
new file mode 100644
index 000000000000..090ddbb6f979
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/freecad-0.16.6712
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=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-cpp/eigen:3 dev-libs/boost:=[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(+)] dev-libs/xerces-c[icu] dev-python/matplotlib[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/pyside:0[X,svg,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/shiboken:0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-qt/designer:4 dev-qt/qtgui:4[-egl] dev-qt/qtopengl:4[-egl] dev-qt/qtsvg:4 media-libs/coin media-libs/freetype sci-libs/opencascade:*[vtk(+)] sci-libs/orocos_kdl sys-libs/zlib virtual/glu >=dev-lang/swig-2.0.4-r1:0 dev-python/pyside-tools:0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-devel/make >=dev-util/cmake-3.7.2 virtual/fortran
+DESCRIPTION=Qt based Computer Aided Design application
+EAPI=6
+HOMEPAGE=https://www.freecadweb.org/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-cpp/eigen:3 dev-libs/boost:=[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(+)] dev-libs/xerces-c[icu] dev-python/matplotlib[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/pyside:0[X,svg,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/shiboken:0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-qt/designer:4 dev-qt/qtgui:4[-egl] dev-qt/qtopengl:4[-egl] dev-qt/qtsvg:4 media-libs/coin media-libs/freetype sci-libs/opencascade:*[vtk(+)] sci-libs/orocos_kdl sys-libs/zlib virtual/glu dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pivy[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-qt/assistant:4 virtual/fortran
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/0.16.6712.tar.gz -> freecad-0.16.6712.tar.gz
+_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c0326610606cf964e1f597f3f481c6b5
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.2 b/metadata/md5-cache/media-gfx/inkscape-0.92.2
index 37226aa82579..fcd7fa0f6b95 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.2
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.2
@@ -4,7 +4,7 @@ DESCRIPTION=A SVG based generic vector-drawing program
 EAPI=6
 HOMEPAGE=https://inkscape.org/
 IUSE=cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex lcms nls spell static-libs visio wpg python_targets_python2_7
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/poppler-0.26.0:=[cairo] >=dev-cpp/glibmm-2.48 >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-cpp/cairomm-1.9.8 >=dev-libs/boehm-gc-7.1:= >=dev-libs/glib-2.28 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml[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(+)] media-gfx/potrace media-gfx/scour[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(+)] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sci-libs/gsl:= x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.24 cdr? ( media-libs/libcdr app-text/libwpg:0.3 dev-libs/librevenge ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) visio? ( media-libs/libvisio app-text/libwpg:0.3 dev-libs/librevenge ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-gfx/uniconvertor dia? ( app-office/dia ) latex? ( media-gfx/pstoedit[plotutils] app-text/dvipsk app-text/texlive-core ) postscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.2.tar.bz2 https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64621b9c6d461a80ebe8666693bdddbe
+_md5_=8f635db9828694a235d76809f02784ba
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
index 0d7c4fc69722..98b7ceb31f96 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Graphviz dot graph file viewer
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/graphics/kgraphviewer/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 FDL-1.2
+KEYWORDS=amd64 ~x86
+LICENSE=GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kgraphviewer/2.4.2/kgraphviewer-2.4.2.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=711b98ebd3051f8258f7f95b48e710f5
+_md5_=daace99338c9887ce9bf1dc66dbc8409
diff --git a/metadata/md5-cache/media-gfx/pdf2svg-0.2.1 b/metadata/md5-cache/media-gfx/pdf2svg-0.2.1
deleted file mode 100644
index 06c2df08135e..000000000000
--- a/metadata/md5-cache/media-gfx/pdf2svg-0.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2= virtual/pkgconfig
-DESCRIPTION=pdf2svg is based on poppler and cairo and can convert pdf to svg files
-EAPI=5
-HOMEPAGE=http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2=
-SLOT=0
-SRC_URI=http://www.cityinthesky.co.uk/files/pdf2svg-0.2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=03dbb8e88ddb3999fbfb410494276a85
diff --git a/metadata/md5-cache/media-gfx/pdf2svg-0.2.2 b/metadata/md5-cache/media-gfx/pdf2svg-0.2.2
deleted file mode 100644
index 3720225480be..000000000000
--- a/metadata/md5-cache/media-gfx/pdf2svg-0.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2= virtual/pkgconfig
-DESCRIPTION=pdf2svg is based on poppler and cairo and can convert pdf to svg files
-EAPI=5
-HOMEPAGE=http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2=
-SLOT=0
-SRC_URI=http://www.cityinthesky.co.uk/wp-content/uploads/2013/10/pdf2svg-0.2.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a15086a2ac9028196bd0bc275305f6b
diff --git a/metadata/md5-cache/media-gfx/pdf2svg-0.2.3 b/metadata/md5-cache/media-gfx/pdf2svg-0.2.3
index 19ac3570c50a..ae698d298cbf 100644
--- a/metadata/md5-cache/media-gfx/pdf2svg-0.2.3
+++ b/metadata/md5-cache/media-gfx/pdf2svg-0.2.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=prepare
-DEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2= virtual/pkgconfig
+DEPEND=>=app-text/poppler-0.12.3-r3[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2= virtual/pkgconfig
 DESCRIPTION=pdf2svg is based on poppler and cairo and can convert pdf to svg files
 EAPI=6
 HOMEPAGE=http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.12.3-r3:=[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2=
+RDEPEND=>=app-text/poppler-0.12.3-r3[cairo] >=x11-libs/cairo-1.2.6:=[svg] x11-libs/gtk+:2=
 SLOT=0
 SRC_URI=https://github.com/dawbarton/pdf2svg/archive/v0.2.3.tar.gz -> pdf2svg-0.2.3.tar.gz
-_md5_=bd001a871fe4ac66cc3a724a48819e38
+_md5_=40dd7cd37b4b520d2ee4d6030a3d4b3c
diff --git a/metadata/md5-cache/media-gfx/qimgv-0.6 b/metadata/md5-cache/media-gfx/qimgv-0.6
new file mode 100644
index 000000000000..080e62b10260
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/qimgv-0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-video/mpv[libmpv] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=A cross-platform image viewer with webm support. Written in qt5
+EAPI=6
+HOMEPAGE=https://github.com/easymodo/qimgv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-video/mpv[libmpv]
+SLOT=0
+SRC_URI=https://github.com/easymodo/qimgv/archive/v0.6.tar.gz -> qimgv-0.6.tar.gz
+_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dc6ac1302bb79088ef68669b51ad6c0c
diff --git a/metadata/md5-cache/media-gfx/qimgv-9999 b/metadata/md5-cache/media-gfx/qimgv-9999
new file mode 100644
index 000000000000..6d001deec6fb
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/qimgv-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-video/mpv[libmpv] virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=A cross-platform image viewer with webm support. Written in qt5.
+EAPI=6
+HOMEPAGE=https://github.com/easymodo/qimgv
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-video/mpv[libmpv]
+SLOT=0
+_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f95eabbea1dbe5573ad94c64bec4bda
diff --git a/metadata/md5-cache/media-gfx/scour-0.36 b/metadata/md5-cache/media-gfx/scour-0.36
index f537a1e67caf..4031c51d83c2 100644
--- a/metadata/md5-cache/media-gfx/scour-0.36
+++ b/metadata/md5-cache/media-gfx/scour-0.36
@@ -4,11 +4,11 @@ DESCRIPTION=Take an SVG file and produce a cleaner and more concise file
 EAPI=6
 HOMEPAGE=https://github.com/scour-project/scour
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=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(-)] 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(-)] 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/scour-project/scour/archive/v0.36.tar.gz -> scour-0.36.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14668d2df429642f1afdb98c7ae55d23
+_md5_=73932741905a0fe9319f8a37186b3357
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index a91d5ac63c8c..0adaf0ddf2e6 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/coin-3.1.3-r2 b/metadata/md5-cache/media-libs/coin-3.1.3-r2
index 910fff077531..54a309dde312 100644
--- a/metadata/md5-cache/media-libs/coin-3.1.3-r2
+++ b/metadata/md5-cache/media-libs/coin-3.1.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A high-level 3D graphics toolkit, fully compatible with SGI Open Inv
 EAPI=5
 HOMEPAGE=https://bitbucket.org/Coin3D/coin/wiki/Home
 IUSE=bzip2 debug doc javascript openal simage static-libs threads zlib
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 PEL )
 RDEPEND=dev-libs/expat media-libs/fontconfig media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext bzip2? ( app-arch/bzip2 ) javascript? ( dev-lang/spidermonkey:0 ) openal? ( media-libs/openal ) simage? ( media-libs/simage ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://bitbucket.org/Coin3D/coin/downloads/Coin-3.1.3.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56c720100f61f29a79afbb4c30996b06
+_md5_=b440a1f760e2a604dc001a29d3f6e479
diff --git a/metadata/md5-cache/media-libs/libextractor-1.3-r1 b/metadata/md5-cache/media-libs/libextractor-1.3-r1
deleted file mode 100644
index 842c083669a8..000000000000
--- a/metadata/md5-cache/media-libs/libextractor-1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/iso-codes >=dev-libs/glib-2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/htmltidy ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Library to extract metadata from files of arbitrary type
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libextractor/
-IUSE=+archive +bzip2 ffmpeg flac gif gsf gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=GPL-3
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/htmltidy ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) !sci-biology/glimmer !sci-chemistry/pdb-extract
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/libextractor/libextractor-1.3.tar.gz
-_md5_=ef28aaa81a713145dee53d334b750c48
diff --git a/metadata/md5-cache/media-libs/libextractor-1.6 b/metadata/md5-cache/media-libs/libextractor-1.6
index 7842bc9a8142..1c85e1adb7f1 100644
--- a/metadata/md5-cache/media-libs/libextractor-1.6
+++ b/metadata/md5-cache/media-libs/libextractor-1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Library to extract metadata from files of arbitrary type
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libextractor/
 IUSE=apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib
-KEYWORDS=amd64 ~arm ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=GPL-3
 RDEPEND=app-text/iso-codes dev-libs/glib:2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/htmltidy ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) !sci-biology/glimmer
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libextractor/libextractor-1.6.tar.gz
-_md5_=77ce04db7424282eb6d2e7a8c549520f
+_md5_=9f2bd37de45bf66deb3cfb21db9e3c2b
diff --git a/metadata/md5-cache/media-libs/libfreehand-0.1.2 b/metadata/md5-cache/media-libs/libfreehand-0.1.2
index 27f71e10f28c..4012d5bb682a 100644
--- a/metadata/md5-cache/media-libs/libfreehand-0.1.2
+++ b/metadata/md5-cache/media-libs/libfreehand-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library for import of FreeHand drawings
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libfreehand
 IUSE=doc static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libfreehand/libfreehand-0.1.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=480fb0e6d25a6831c345623237b263d1
+_md5_=3a2f9057e5146f2d67c4d055cae64296
diff --git a/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1 b/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
index c00e7e18e0c7..8669e6f751b2 100644
--- a/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
+++ b/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
@@ -4,9 +4,9 @@ DESCRIPTION=C++ Library that parses the file format of Aldus/Adobe PageMaker doc
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker
 IUSE=debug doc tools
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-0.0.3.tar.xz
-_md5_=d0b4ab8d9e6832bea015ac605e099771
+_md5_=b8268b5260a399516a4129c63ee024b5
diff --git a/metadata/md5-cache/media-libs/simage-1.7.0-r1 b/metadata/md5-cache/media-libs/simage-1.7.0-r1
index dfc621282d8e..811b31c79aef 100644
--- a/metadata/md5-cache/media-libs/simage-1.7.0-r1
+++ b/metadata/md5-cache/media-libs/simage-1.7.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Image and video texturing library
 EAPI=6
 HOMEPAGE=https://bitbucket.org/Coin3D/simage
 IUSE=debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 x86
 LICENSE=public-domain mpeg2enc
 RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0= ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://bitbucket.org/Coin3D/coin/downloads/simage-1.7.0.tar.gz
-_md5_=c1e834654a954683075ee9b0228b6b62
+_md5_=8e76519b043374f4cdb8623b374da47a
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-9999 b/metadata/md5-cache/media-libs/vulkan-loader-9999
index 206ddd53e7cf..2c522c5c2491 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-9999
+++ b/metadata/md5-cache/media-libs/vulkan-loader-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) demos? ( dev-util/glslang:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,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/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers
-IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=demos wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=Apache-2.0
 SLOT=0
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96d04b67a68c8d286b56321e10d23be3
+_md5_=8abe2143746ddae57ca414bcaacff6d3
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index db9a2065af8b..5a717e6e2eaa 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/hydrogen-1.0.0_pre20180301 b/metadata/md5-cache/media-sound/hydrogen-1.0.0_pre20180301-r1
similarity index 74%
rename from metadata/md5-cache/media-sound/hydrogen-1.0.0_pre20180301
rename to metadata/md5-cache/media-sound/hydrogen-1.0.0_pre20180301-r1
index a7bfd31f0c81..af9258db1375 100644
--- a/metadata/md5-cache/media-sound/hydrogen-1.0.0_pre20180301
+++ b/metadata/md5-cache/media-sound/hydrogen-1.0.0_pre20180301-r1
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Advanced drum machine
 EAPI=6
 HOMEPAGE=http://www.hydrogen-music.org/
 IUSE=alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 ZLIB
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1a477ffe380f153c5d9fb3495d9874df7f75334f.tar.gz -> hydrogen-1.0.0_pre20180301.tar.gz
-_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c5355b8307bc6b89dc0082ac3ae460ec
+_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=435bf4ac9113740fd3ce96c5f1f053c5
diff --git a/metadata/md5-cache/media-sound/hydrogen-9999 b/metadata/md5-cache/media-sound/hydrogen-9999
index f0f4766e347c..498ec294bae7 100644
--- a/metadata/md5-cache/media-sound/hydrogen-9999
+++ b/metadata/md5-cache/media-sound/hydrogen-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=636619dc09b39a4f9969da653056501c
+_md5_=7410a7ec922305a3724f1a7b5ebe0240
diff --git a/metadata/md5-cache/media-sound/terminatorx-3.84-r1 b/metadata/md5-cache/media-sound/terminatorx-3.84-r1
deleted file mode 100644
index ae96da041ec3..000000000000
--- a/metadata/md5-cache/media-sound/terminatorx-3.84-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) mad? ( media-sound/madplay ) vorbis? ( media-libs/libvorbis ) sox? ( media-sound/sox media-sound/mpg123 ) >=x11-libs/gtk+-2.2:2 >=dev-libs/glib-2.2:2 x11-libs/libXi x11-libs/libXxf86dga dev-libs/libxml2 media-libs/audiofile media-libs/ladspa-sdk media-libs/ladspa-cmt app-text/scrollkeeper media-libs/liblrdf virtual/pkgconfig x11-proto/xproto x11-proto/inputproto x11-proto/xf86dgaproto >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Realtime audio synthesizer allowing you to 'scratch' on sampled audio data
-EAPI=5
-HOMEPAGE=http://www.terminatorx.org/
-IUSE=alsa debug mad vorbis sox
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=alsa? ( media-libs/alsa-lib ) mad? ( media-sound/madplay ) vorbis? ( media-libs/libvorbis ) sox? ( media-sound/sox media-sound/mpg123 ) >=x11-libs/gtk+-2.2:2 >=dev-libs/glib-2.2:2 x11-libs/libXi x11-libs/libXxf86dga dev-libs/libxml2 media-libs/audiofile media-libs/ladspa-sdk media-libs/ladspa-cmt app-text/scrollkeeper media-libs/liblrdf
-SLOT=0
-SRC_URI=http://www.terminatorx.org/dist/terminatorX-3.84.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f80bf63a7ba206a6af4bde6d3b81a0c9
diff --git a/metadata/md5-cache/media-sound/ventrilo-server-bin-2.3.1 b/metadata/md5-cache/media-sound/ventrilo-server-bin-2.3.1
deleted file mode 100644
index a81beec4cbc4..000000000000
--- a/metadata/md5-cache/media-sound/ventrilo-server-bin-2.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install nofetch
-DESCRIPTION=The Ventrilo Voice Communication Server
-EAPI=0
-HOMEPAGE=http://www.ventrilo.com/
-KEYWORDS=-* x86 amd64
-LICENSE=ventrilo
-RDEPEND=sys-libs/glibc
-RESTRICT=fetch
-SLOT=0
-SRC_URI=ventrilo_srv-2.3.1-Linux-i386.tar.gz
-_md5_=011aa9b9a434338f6540769284cb263b
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 496df4325a28..9cea86a0e052 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.3.6 b/metadata/md5-cache/media-video/ffmpeg-3.3.6
index 63e06e6d10ef..23c830218c72 100644
--- a/metadata/md5-cache/media-video/ffmpeg-3.3.6
+++ b/metadata/md5-cache/media-video/ffmpeg-3.3.6
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=6
 HOMEPAGE=http://ffmpeg.org/
 IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh schroedinger speex vorbis vpx zvbi bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband sofalizer zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 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 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.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(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.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(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.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(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.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(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.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(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.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(-)?] ) snappy? ( >=app-arch/snappy-1.1.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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.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(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.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(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-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(-)?] ) gme? ( >=media-libs/game-music-emu-0.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(-)?] ) gmp? ( >=dev-libs/gmp-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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.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(-)?] ) iconv? ( >=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(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] >=sys-libs/libavc1394-0.5.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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2: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(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.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(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.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(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=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(-)?] ) opus? ( >=media-libs/opus-1.0.2-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.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(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.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(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-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(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.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(-)?] ) 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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.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(-)?] ) xcb? ( >=x11-libs/libxcb-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(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.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(-)?] ) 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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -12,4 +12,4 @@ RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/55.57.57
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.3.6.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3876676177422e69e6928f0ba156dfd
+_md5_=c100bad0a584cbf48820930973dfafed
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 80fd0e7c9d0a..cebfabee9287 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( |
 SLOT=0
 SRC_URI=https://waf.io/waf-1.9.8
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=137519fd9539a9944e42ae8dbcc096e7
+_md5_=86fe0e1b289df974d54ab408fb639866
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index c6f72d37e3b2..908eb940a286 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/bind-9.11.2_p1 b/metadata/md5-cache/net-dns/bind-9.11.2_p1
index e42980047ee2..cf4a21b9c353 100644
--- a/metadata/md5-cache/net-dns/bind-9.11.2_p1
+++ b/metadata/md5-cache/net-dns/bind-9.11.2_p1
@@ -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=https://www.isc.org/downloads/file/bind-9.11.2-P1/?version=tar-gz -> bind-9.11.2_p1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a661fd506212f3e7d4786ca52c6de4b2
+_md5_=c3192323a68df442c9006534ec9445aa
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1 b/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1
index 89e47ec0ed58..7da661915041 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1
+++ b/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1
@@ -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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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-2:= ) 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=https://www.isc.org/downloads/file/bind-9.11.2-P1/?version=tar-gz -> bind-9.11.2_p1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5ead10777daef165e3d9d5207192d461
+_md5_=0335e79457c1734e0d05170d32365642
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.6 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.6
index 8c7b40e4d235..6f14434ccfa4 100644
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.6
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.6
@@ -4,9 +4,9 @@ DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
 EAPI=6
 HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
 IUSE=+filecaps
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.6.tar.gz -> dnscrypt-proxy-2.0.6.tar.gz
 _eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=760d8b7129be4c082b3100b37fb5d521
+_md5_=f7d4c565e9f541fd36719252f86b25c5
diff --git a/metadata/md5-cache/net-dns/libidn-1.33-r2 b/metadata/md5-cache/net-dns/libidn-1.33-r2
index 6d1e3b9f980e..096f31fb10c1 100644
--- a/metadata/md5-cache/net-dns/libidn-1.33-r2
+++ b/metadata/md5-cache/net-dns/libidn-1.33-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls 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 ~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 ~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=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-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(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.33.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=48677a0ea289e76ef15f4291d5dfd582
+_md5_=31a180f65de311f544d8c76bf506ac0d
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 87840f0eecc6..1ca0197330fb 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/samba-4.2.14 b/metadata/md5-cache/net-fs/samba-4.2.14
index c44d7f7618b3..86e014cfc8c7 100644
--- a/metadata/md5-cache/net-fs/samba-4.2.14
+++ b/metadata/md5-cache/net-fs/samba-4.2.14
@@ -4,11 +4,11 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=5
 HOMEPAGE=https://www.samba.org/
 IUSE=acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=arm hppa
 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/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(-)?] sys-libs/readline:= virtual/libiconv 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(-)?] >=net-libs/socket_wrapper-1.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(-)?] 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/libcap >=sys-libs/ldb-1.1.24[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,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/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/nss_wrapper-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(-)?] >=sys-libs/ntdb-1.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_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/talloc-2.1.2[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.6[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.28[abi_x86_32(-)?,abi_x86_64(-)?,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/uid_wrapper-1.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) 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 ) 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(-)?] ) pam? ( virtual/pam ) 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(-)?] ) !system-mitkrb5? ( >=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(-)?] ) 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 ) python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.2.14.tar.gz https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.2.12.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=5a187d2b6f7dc2feada058ee506e9a21
+_md5_=29bea1936775a20e1ed3ccba5ffa9468
diff --git a/metadata/md5-cache/net-fs/samba-4.5.15 b/metadata/md5-cache/net-fs/samba-4.5.15
index 1efc7c2fff71..a8fadb11040b 100644
--- a/metadata/md5-cache/net-fs/samba-4.5.15
+++ b/metadata/md5-cache/net-fs/samba-4.5.15
@@ -4,7 +4,7 @@ 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 ~arm64 ia64 ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc 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/ldb-1.1.30[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
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.5.15.tar.gz https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=9f4d2999d5a23490b75cb5ecdeaf0335
+_md5_=3682f63bb00cd488c67b9330b1d4dc8b
diff --git a/metadata/md5-cache/net-fs/samba-4.5.10-r1 b/metadata/md5-cache/net-fs/samba-4.5.16
similarity index 52%
rename from metadata/md5-cache/net-fs/samba-4.5.10-r1
rename to metadata/md5-cache/net-fs/samba-4.5.16
index 0d4288a2f258..21707055af3c 100644
--- a/metadata/md5-cache/net-fs/samba-4.5.10-r1
+++ b/metadata/md5-cache/net-fs/samba-4.5.16
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=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= ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=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/ldb-1.1.30[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= ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
-HOMEPAGE=https://www.samba.org/
+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 ~arm64 ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~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
+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/ldb-1.1.30[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
+RESTRICT=test
 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
+SRC_URI=mirror://samba/stable/samba-4.5.16.tar.gz https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=99073552d3c5be0027178b192b430f46
+_md5_=3441d8ec2edf952812f9dacd54f76120
diff --git a/metadata/md5-cache/net-fs/samba-4.6.12 b/metadata/md5-cache/net-fs/samba-4.6.12
deleted file mode 100644
index 2442a6d25bd4..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.6.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=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(-)?] >=dev-util/cmocka-1.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-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.29[ldap(+)?,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/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.9[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.12[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.34[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/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] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) 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= ) 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-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=http://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python 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=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=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(-)?] >=dev-util/cmocka-1.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-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.29[ldap(+)?,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/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.9[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.12[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.34[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/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] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) 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= ) python? ( 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(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls !system-mitkrb5 ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.6.12.tar.gz https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=4f6d578f415cd30cb74323e3aad5b5bb
diff --git a/metadata/md5-cache/net-fs/samba-4.6.13 b/metadata/md5-cache/net-fs/samba-4.6.14
similarity index 99%
rename from metadata/md5-cache/net-fs/samba-4.6.13
rename to metadata/md5-cache/net-fs/samba-4.6.14
index 6a290879a8ba..82c8bb6db437 100644
--- a/metadata/md5-cache/net-fs/samba-4.6.13
+++ b/metadata/md5-cache/net-fs/samba-4.6.14
@@ -10,6 +10,6 @@ RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 REQUIRED_USE=addc? ( python gnutls !system-mitkrb5 ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.6.13.tar.gz https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz
+SRC_URI=mirror://samba/stable/samba-4.6.14.tar.gz https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
 _md5_=2005e309c9ac95b8c97eda14998bd56f
diff --git a/metadata/md5-cache/net-fs/samba-4.7.4 b/metadata/md5-cache/net-fs/samba-4.7.4
deleted file mode 100644
index 456b9cb778fc..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=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(-)?] >=dev-util/cmocka-1.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(-)?] 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.2.3[ldap(+)?,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/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.9[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.14[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.34[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/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] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) 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-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) 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-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=http://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python 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=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=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(-)?] >=dev-util/cmocka-1.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(-)?] 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.2.3[ldap(+)?,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/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.9[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.14[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.34[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/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] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) 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-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( 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(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.7.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=1ec0db60309d5f13afdfb1ae8b984874
diff --git a/metadata/md5-cache/net-fs/samba-4.7.5 b/metadata/md5-cache/net-fs/samba-4.7.6
similarity index 99%
rename from metadata/md5-cache/net-fs/samba-4.7.5
rename to metadata/md5-cache/net-fs/samba-4.7.6
index f1ebb7bb293d..b3fb8da8ca47 100644
--- a/metadata/md5-cache/net-fs/samba-4.7.5
+++ b/metadata/md5-cache/net-fs/samba-4.7.6
@@ -10,6 +10,6 @@ RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 REQUIRED_USE=addc? ( python gnutls ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.7.5.tar.gz
+SRC_URI=mirror://samba/stable/samba-4.7.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
 _md5_=9ee31c1ba2ad837be7925124f331ad1c
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index c4e31a6a0399..415a7bb50a36 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libssh-0.7.5-r2 b/metadata/md5-cache/net-libs/libssh-0.7.5-r2
new file mode 100644
index 000000000000..192126f27847
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libssh-0.7.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!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(-)?] ) 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(-)?] ) doc? ( app-doc/doxygen ) test? ( >=dev-util/cmocka-0.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Access a working SSH implementation by means of a library
+EAPI=6
+HOMEPAGE=https://www.libssh.org/
+IUSE=debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 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-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=!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(-)?] ) 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(-)?] )
+SLOT=0/4
+SRC_URI=https://red.libssh.org/attachments/download/218/libssh-0.7.5.tar.xz -> libssh-0.7.5.tar.xz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1babbf8a4dc76273d6d5c98709122570
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.7.1 b/metadata/md5-cache/net-libs/mbedtls-2.7.1
index 51d9b24daa6a..5ced5977644d 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.7.1
+++ b/metadata/md5-cache/net-libs/mbedtls-2.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=Cryptographic library for embedded systems
 EAPI=6
 HOMEPAGE=https://tls.mbed.org/
 IUSE=cpu_flags_x86_sse2 doc havege libressl programs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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(-)?] )
 SLOT=0/10
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.7.1.tar.gz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=565a407b05a9963d241415f4b937154f
+_md5_=b76054b2fd0ccb2f512168705db360d3
diff --git a/metadata/md5-cache/net-libs/pjproject-2.7.1 b/metadata/md5-cache/net-libs/pjproject-2.7.1
index f838509feec4..aa9602903bd6 100644
--- a/metadata/md5-cache/net-libs/pjproject-2.7.1
+++ b/metadata/md5-cache/net-libs/pjproject-2.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
 EAPI=6
 HOMEPAGE=http://www.pjsip.org/
 IUSE=amr debug doc epoll examples ipv6 opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 sdl ffmpeg v4l2 openh264 libyuv alsa oss portaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) oss? ( media-libs/portaudio[oss] ) portaudio? ( media-libs/portaudio ) amr? ( media-libs/opencore-amr ) gsm? ( media-sound/gsm ) ilbc? ( dev-libs/ilbc-rfc3951 ) opus? ( media-libs/opus ) speex? ( media-libs/speexdsp ) ffmpeg? ( virtual/ffmpeg:= ) sdl? ( media-libs/libsdl ) openh264? ( media-libs/openh264 ) resample? ( media-libs/libsamplerate ) ssl? ( dev-libs/openssl:= ) net-libs/libsrtp:0
 REQUIRED_USE=?? ( alsa oss portaudio )
 SLOT=0
 SRC_URI=http://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b21d84cde662c1868b22a52cd54ddd9
+_md5_=3f52c7af98c05c5b53364e79c4207e61
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 60ef1697f7cc..ca38f6135836 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.34 b/metadata/md5-cache/net-mail/dovecot-2.2.34
index 7b0fbab72391..f8bac346b184 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.34
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.34
@@ -4,11 +4,11 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=https://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 REQUIRED_USE=ssl
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.34.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz )
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5f762e5a4ff4da162be137d109eb7ec6
+_md5_=e39a9e1d39c0774763435988ada103df
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index cc9a0334b724..1f29c10231c9 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/asterisk-13.19.0-r1 b/metadata/md5-cache/net-misc/asterisk-13.19.0-r1
index e5e340253b58..5d33dfaeb847 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.19.0-r1
+++ b/metadata/md5-cache/net-misc/asterisk-13.19.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=6
 HOMEPAGE=http://www.asterisk.org/
 IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
 RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.19.0.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ec5e06ce2154ad98c1a744179476ff7f
+_md5_=8eb8f9cb6e126da8bcd73885f0446821
diff --git a/metadata/md5-cache/net-misc/dhcp-4.3.6_p1 b/metadata/md5-cache/net-misc/dhcp-4.3.6_p1
index dc9d902f7054..b6688e0a1fcf 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.3.6_p1
+++ b/metadata/md5-cache/net-misc/dhcp-4.3.6_p1
@@ -4,10 +4,10 @@ DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=6
 HOMEPAGE=http://www.isc.org/products/DHCP
 IUSE=+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax
-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=ISC BSD SSLeay GPL-2
 RDEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.3.6-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.3.6-P1/dhcp-4.3.6-P1.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b033770811445d5b36da8e179b12405b
+_md5_=e57dafc5120f21eae9c99910814ba2dc
diff --git a/metadata/md5-cache/net-misc/eventd-0.23.0_p20171112 b/metadata/md5-cache/net-misc/eventd-0.24.0
similarity index 95%
rename from metadata/md5-cache/net-misc/eventd-0.23.0_p20171112
rename to metadata/md5-cache/net-misc/eventd-0.24.0
index 6da58e126524..9410977d7a7a 100644
--- a/metadata/md5-cache/net-misc/eventd-0.23.0_p20171112
+++ b/metadata/md5-cache/net-misc/eventd-0.24.0
@@ -9,6 +9,6 @@ LICENSE=GPL-3+ LGPL-3+ MIT
 RDEPEND=>=dev-libs/glib-2.40:2 sys-apps/util-linux x11-libs/libxkbcommon introspection? ( >=dev-libs/gobject-introspection-1.42 ) libcanberra? ( media-libs/libcanberra ) libnotify? ( x11-libs/gdk-pixbuf:2 ) notification? ( x11-libs/cairo x11-libs/pango x11-libs/gdk-pixbuf:2 X? ( x11-libs/cairo[xcb] x11-libs/libxcb:= x11-libs/xcb-util x11-libs/xcb-util-wm ) ) pulseaudio? ( media-libs/libsndfile media-sound/pulseaudio ) purple? ( net-im/pidgin ) speech? ( >=app-accessibility/speech-dispatcher-0.8.7 ) systemd? ( sys-apps/systemd:= ) upnp? ( net-libs/gssdp:= ) webhook? ( >=net-libs/libsoup-2.42:2.4 ) websocket? ( >=net-libs/libsoup-2.50:2.4 ) zeroconf? ( net-dns/avahi[dbus] ) net-libs/glib-networking[ssl]
 REQUIRED_USE=X? ( notification ) fbcon? ( notification ) notification? ( || ( X fbcon ) ) test? ( websocket )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~kensington/distfiles/eventd-0.23.0_p20171112.tgz
+SRC_URI=https://www.eventd.org/download/eventd/eventd-0.24.0.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=817f8f88e82b8aaebbe7bf1a9f76485e
+_md5_=fb42ffbeb7c9eb5d92b2af1201aa03ce
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.39 b/metadata/md5-cache/net-misc/memcached-1.4.39
index 3f3d12f143d4..2024860b492e 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.39
+++ b/metadata/md5-cache/net-misc/memcached-1.4.39
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=5
 HOMEPAGE=http://memcached.org/
 IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.4.39.tar.gz https://www.memcached.org/files/old/memcached-1.4.39.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7376c78a1e6a962ded9c6698d3645dee
+_md5_=ecd966873935952dcd356eee0c2aee99
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.2 b/metadata/md5-cache/net-misc/memcached-1.5.2
index 01b633f408f3..65eafaf10a67 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.2
+++ b/metadata/md5-cache/net-misc/memcached-1.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=6
 HOMEPAGE=http://memcached.org/
 IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.2.tar.gz https://www.memcached.org/files/old/memcached-1.5.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=298cec09ba76323096991f0a33b35b28
+_md5_=1620be02031684a6a328a28584fef394
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.6 b/metadata/md5-cache/net-misc/memcached-1.5.6
index 7193ef95fc97..6fdace409bfe 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.6
+++ b/metadata/md5-cache/net-misc/memcached-1.5.6
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=6
 HOMEPAGE=http://memcached.org/
 IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.6.tar.gz https://www.memcached.org/files/old/memcached-1.5.6.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d13a89ab4cd13563e5d3c00ddbd2a7e8
+_md5_=e0c4082691e53399e4572c188c7c52fe
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p11 b/metadata/md5-cache/net-misc/ntp-4.2.8_p11
index 054d248529d6..c1465060ed62 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p11
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p11
@@ -4,11 +4,11 @@ DESCRIPTION=Network Time Protocol suite/programs
 EAPI=6
 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 ~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 ~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] ) 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 ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p11.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p11-manpages.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3dd1db962cd261c703f3fbf734fd3e2
+_md5_=1a1ad0ba36851a1ee860776e03376e5c
diff --git a/metadata/md5-cache/net-misc/nx-3.5.99.15 b/metadata/md5-cache/net-misc/nx-3.5.99.15
index 3e41334df447..32c43b29d954 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.99.15
+++ b/metadata/md5-cache/net-misc/nx-3.5.99.15
@@ -10,4 +10,4 @@ RDEPEND=media-libs/freetype:2 >=media-libs/libpng-1.2.8:* >=sys-libs/zlib-1.2.3
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.99.15-full.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f0370cfc1171757281f10f94227520e
+_md5_=f7996e14520c6d3227a9fe9f3f6f18da
diff --git a/metadata/md5-cache/net-misc/openssh-7.6_p1 b/metadata/md5-cache/net-misc/openssh-7.6_p1
deleted file mode 100644
index 9de5b6b37a9e..000000000000
--- a/metadata/md5-cache/net-misc/openssh-7.6_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-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-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Port of OpenBSD's free SSH release
-EAPI=6
-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 +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 ~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 ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.6p1-hpnssh14v12.tar.xz ) ldap? ( https://dev.gentoo.org/~polynomial-c/openssh-lpk-7.6p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-11.0/openssh-7.6p1+x509-11.0.diff.gz )
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7fd29e0d0ab6bf1ceefa45bda66f3178
diff --git a/metadata/md5-cache/net-misc/openssh-7.6_p1-r2 b/metadata/md5-cache/net-misc/openssh-7.6_p1-r2
deleted file mode 100644
index fca49635901b..000000000000
--- a/metadata/md5-cache/net-misc/openssh-7.6_p1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-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-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Port of OpenBSD's free SSH release
-EAPI=6
-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 +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 ~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 ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz ldap? ( https://dev.gentoo.org/~polynomial-c/openssh-lpk-7.6p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-11.0/openssh-7.6p1+x509-11.0.diff.gz )
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2711dc2217e5d04b6b1ec0631cb64e71
diff --git a/metadata/md5-cache/net-misc/openssh-7.6_p1-r3 b/metadata/md5-cache/net-misc/openssh-7.6_p1-r5
similarity index 97%
rename from metadata/md5-cache/net-misc/openssh-7.6_p1-r3
rename to metadata/md5-cache/net-misc/openssh-7.6_p1-r5
index ce5282d1c7a7..2acb9e01f957 100644
--- a/metadata/md5-cache/net-misc/openssh-7.6_p1-r3
+++ b/metadata/md5-cache/net-misc/openssh-7.6_p1-r5
@@ -9,6 +9,6 @@ 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 ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
 SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/openssh-7.6p1-hpnssh14v12-r1.tar.xz ) ldap? ( https://dev.gentoo.org/~polynomial-c/openssh-lpk-7.6p1-0.3.14.patch.xz ) X509? ( https://dev.gentoo.org/~chutzpah/openssh-7.6p1+x509-11.1.diff.gz )
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/openssh-7.6p1-hpnssh14v12-r1.tar.xz ) ldap? ( https://dev.gentoo.org/~polynomial-c/openssh-lpk-7.6p1-0.3.14.patch.xz ) X509? ( https://dev.gentoo.org/~chutzpah/openssh-7.6p1+x509-11.2.diff.gz )
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=399ecf67866f4b52a1dcf04f3d238fea
+_md5_=61a936a68480394bb1e98380ee80951f
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.4.1 b/metadata/md5-cache/net-misc/owncloud-client-2.4.1
new file mode 100644
index 000000000000..a69af6693854
--- /dev/null
+++ b/metadata/md5-cache/net-misc/owncloud-client-2.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) dev-qt/linguist-tools:5 doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Synchronize files from ownCloud Server with your computer
+EAPI=6
+HOMEPAGE=http://owncloud.org/
+IUSE=doc dolphin nautilus samba +sftp shibboleth test
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-3.0 GPL-2
+RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/nextcloud-client
+SLOT=0
+SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-2.4.1.tar.xz
+_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b8ce647008d16486572d22502025ff61
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.3 b/metadata/md5-cache/net-misc/rsync-3.1.3
index e33843e313e9..b3a2e1350e49 100644
--- a/metadata/md5-cache/net-misc/rsync-3.1.3
+++ b/metadata/md5-cache/net-misc/rsync-3.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=File transfer program to keep remote files into sync
 EAPI=6
 HOMEPAGE=https://rsync.samba.org/
 IUSE=acl examples iconv ipv6 static stunnel xattr
-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=GPL-3
 RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48dd071430ebba749889d5a304b52c66
+_md5_=4104be07b029e10b7e072dd3316a6400
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.1.1 b/metadata/md5-cache/net-misc/x2goclient-4.1.1.1
index 9bbde738b820..3b946fe85aca 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.1.1
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.1.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.6.0_rc1 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.7.5-r2 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) dev-qt/linguist-tools:5 >=sys-apps/sed-4
 DESCRIPTION=The X2Go Qt client
 EAPI=6
 HOMEPAGE=http://www.x2go.org
 IUSE=ldap
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.6.0_rc1 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) net-misc/nx
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.7.5-r2 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) net-misc/nx
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7b26be4e8b081108b01a0834a73631a2
+_md5_=71ab0b57fee2cde0a0d30f580534f15d
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.0.1.22 b/metadata/md5-cache/net-misc/x2goserver-4.0.1.22
index 365419456d05..0801d53851ce 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.0.1.22
+++ b/metadata/md5-cache/net-misc/x2goserver-4.0.1.22
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=virtual/pkgconfig
+DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig
 DESCRIPTION=The X2Go server
 EAPI=6
 HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.0.25 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Try-Tiny media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.0.25 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.0.1.22.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba6722f0516e20fbee4fb700f0aa962f
+_md5_=80c4fd459a41f959d627a859dbdf6ddc
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.0.1.22-r1 b/metadata/md5-cache/net-misc/x2goserver-4.0.1.22-r1
index 8c048eac4b2d..e009fb8cb994 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.0.1.22-r1
+++ b/metadata/md5-cache/net-misc/x2goserver-4.0.1.22-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=virtual/pkgconfig
+DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig
 DESCRIPTION=The X2Go server
 EAPI=6
 HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.0.25 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Try-Tiny media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.0.25 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.0.1.22.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c332fdeeb843c1952cbff118bdcc811a
+_md5_=1da0e8899629d909115dd12a99ee8781
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.0 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.0
index 24a5e1e18bdf..b265951cf8f4 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.0
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=virtual/pkgconfig
+DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig
 DESCRIPTION=The X2Go server
 EAPI=6
 HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Switch media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.0.25 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Switch dev-perl/Try-Tiny media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.0.25 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98b96d57a6258cbfba2c9d609e64e497
+_md5_=97689f1b1ae916cfe8b60c56e5accc97
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.0-r1 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.0-r1
index 23c9822bc030..34d70a0ca3c0 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.0-r1
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=virtual/pkgconfig
+DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig
 DESCRIPTION=The X2Go server
 EAPI=6
 HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Switch media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.99.14 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Switch dev-perl/Try-Tiny media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.99.14 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=29d9704bac781f66cea39afd0c300618
+_md5_=09c63fa0d019e7d795e6fd1bcaff30a3
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index c8e97de3fb1a..18251bc72ba8 100644
Binary files a/metadata/md5-cache/net-nds/Manifest.gz and b/metadata/md5-cache/net-nds/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nds/rpcbind-0.2.4-r2 b/metadata/md5-cache/net-nds/rpcbind-0.2.4-r3
similarity index 93%
rename from metadata/md5-cache/net-nds/rpcbind-0.2.4-r2
rename to metadata/md5-cache/net-nds/rpcbind-0.2.4-r3
index 2bc80bf63863..a0fd34d67be6 100644
--- a/metadata/md5-cache/net-nds/rpcbind-0.2.4-r2
+++ b/metadata/md5-cache/net-nds/rpcbind-0.2.4-r3
@@ -7,7 +7,8 @@ IUSE=debug selinux systemd tcpd warmstarts
 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 )
+REQUIRED_USE=systemd? ( warmstarts )
 SLOT=0
 SRC_URI=mirror://sourceforge/rpcbind/rpcbind-0.2.4.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e8b1f6d0e76929201e49804606a18f2
+_md5_=ffa588d8144eb0eb2d4d835663c78133
diff --git a/metadata/md5-cache/net-nds/rpcbind-9999 b/metadata/md5-cache/net-nds/rpcbind-9999
index fa1f56fe0591..7c4f2968dcde 100644
--- a/metadata/md5-cache/net-nds/rpcbind-9999
+++ b/metadata/md5-cache/net-nds/rpcbind-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://sourceforge.net/projects/rpcbind/
 IUSE=debug selinux systemd tcpd warmstarts
 LICENSE=BSD
 RDEPEND=>=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-rpcbind )
+REQUIRED_USE=systemd? ( warmstarts )
 SLOT=0
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b94f349428bc1f31b15e5f3d2385c421
+_md5_=b27433dad639aa2d5cb881de2c4235cf
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 4c608d9f5d9c..26e0532cea17 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index 3110ab5e45fd..59271b776574 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libb64:0= >=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? (
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c9369318a4d3bb1214ee07f5f2143cb3
+_md5_=a3654663747ff4692f9ea2e729824666
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 5aa51a504317..8b3dcb29a6fb 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cups-filters-1.17.9 b/metadata/md5-cache/net-print/cups-filters-1.17.9
index 37eec8a8bb98..b28c9922cb45 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.17.9
+++ b/metadata/md5-cache/net-print/cups-filters-1.17.9
@@ -4,10 +4,10 @@ DESCRIPTION=Cups filters
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test 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=>=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 ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.17.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=09fd48169218f1b9ca0fcc13b7eeb767
+_md5_=a7af064f5ab0d229514b386f81e5e366
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index ff81da9f062f..c19225c3b1a7 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/bluez-5.49 b/metadata/md5-cache/net-wireless/bluez-5.49
new file mode 100644
index 000000000000..c6caaa9170db
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/bluez-5.49
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/glib-2.28: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-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) mesh? ( dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) virtual/pkgconfig test? ( 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/dbus-python-1[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/pygobject:3[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-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Bluetooth Tools and System Daemons for Linux
+EAPI=6
+HOMEPAGE=http://www.bluez.org
+IUSE=alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.28: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-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) mesh? ( dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( 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/dbus-python-1[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/pygobject:3[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=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 ) user-session? ( systemd )
+SLOT=0/3
+SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.49.tar.xz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=47503bcf6dde98932b5d61e087fbb1bb
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 5f5f66a3e748..04b09ff33335 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/rebase-1803 b/metadata/md5-cache/sci-biology/rebase-1803
new file mode 100644
index 000000000000..e04f8ae6b53d
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/rebase-1803
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
+DESCRIPTION=A restriction enzyme database
+EAPI=6
+HOMEPAGE=http://rebase.neb.com
+IUSE=emboss minimal
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/rebase-1803.tar.xz
+_md5_=03338bf80d0fb82894ab8e39e00b1898
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 6150d3fae859..20f2b9c477c0 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/laszip-2.2.0 b/metadata/md5-cache/sci-geosciences/laszip-2.2.0
index 6e0018bb8ff5..064034215c60 100644
--- a/metadata/md5-cache/sci-geosciences/laszip-2.2.0
+++ b/metadata/md5-cache/sci-geosciences/laszip-2.2.0
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Library for free and lossless compression of the LAS LiDAR format
 EAPI=5
 HOMEPAGE=http://www.laszip.org/
-KEYWORDS=amd64 ~ia64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~ia64 ppc ppc64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/LASzip/LASzip/releases/download/v2.2.0/laszip-src-2.2.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fbcddae8b76f57b3b9de2e091ba39e7f
+_md5_=d8eb70120dfab06c87245a07de9a35a7
diff --git a/metadata/md5-cache/sci-geosciences/liblas-1.8.1 b/metadata/md5-cache/sci-geosciences/liblas-1.8.1
index a558e7daae63..4df50b0d079e 100644
--- a/metadata/md5-cache/sci-geosciences/liblas-1.8.1
+++ b/metadata/md5-cache/sci-geosciences/liblas-1.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=C/C++ library for manipulating the LAS LiDAR format common in GIS
 EAPI=6
 HOMEPAGE=http://www.liblas.org
 IUSE=gdal
-KEYWORDS=amd64 ~ia64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~ia64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff gdal? ( sci-libs/gdal )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/liblas/libLAS-1.8.1.tar.bz2
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=493e6033cdcf0e0030fbda3e5c5d1d1c
+_md5_=007f6f0069496d9898e5f6c9f4209992
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index be839cc93c0b..2c0c37cfa0a6 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/gdal-2.2.3-r1 b/metadata/md5-cache/sci-libs/gdal-2.2.3-r1
index f3950f132ba7..a74a57120f9e 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.2.3-r1
+++ b/metadata/md5-cache/sci-libs/gdal-2.2.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Translator library for raster geospatial data formats (includes OGR
 EAPI=6
 HOMEPAGE=http://www.gdal.org/
 IUSE=armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD Info-ZIP MIT
 RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib:=[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) 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/numpy[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(-)] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) java? ( >=virtual/jre-1.7:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) spatialite? ( sqlite )
 SLOT=0/2.2
 SRC_URI=http://download.osgeo.org/gdal/2.2.3/gdal-2.2.3.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=46bb8c1b1721681b238120ba8f1cbf0a
+_md5_=5f78f00c87b998c4e596ab38b39aeb37
diff --git a/metadata/md5-cache/sci-libs/silo-4.10.2 b/metadata/md5-cache/sci-libs/silo-4.10.2
deleted file mode 100644
index 8ea613c37c22..000000000000
--- a/metadata/md5-cache/sci-libs/silo-4.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=hdf5? ( sci-libs/hdf5 ) qt4? ( dev-qt/qtgui:4 ) virtual/fortran
-DESCRIPTION=A mesh and field I/O library and scientific database
-EAPI=5
-HOMEPAGE=https://wci.llnl.gov/simulation/computer-codes/silo
-IUSE=hdf5 +silex static-libs qt4 test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=hdf5? ( sci-libs/hdf5 ) qt4? ( dev-qt/qtgui:4 ) virtual/fortran
-REQUIRED_USE=silex? ( qt4 )
-SLOT=0
-SRC_URI=https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.10.2/silo-4.10.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=178e9530a27cfaf0100ebbcafa6c6bb3
diff --git a/metadata/md5-cache/sci-libs/silo-4.9.1 b/metadata/md5-cache/sci-libs/silo-4.9.1
deleted file mode 100644
index 897016d03615..000000000000
--- a/metadata/md5-cache/sci-libs/silo-4.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=hdf5? ( sci-libs/hdf5 ) qt4? ( dev-qt/qtgui:4 )
-DESCRIPTION=A mesh and field I/O library and scientific database
-EAPI=5
-HOMEPAGE=https://wci.llnl.gov/codes/silo
-IUSE=hdf5 +silex static-libs qt4 test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=hdf5? ( sci-libs/hdf5 ) qt4? ( dev-qt/qtgui:4 )
-REQUIRED_USE=silex? ( qt4 )
-SLOT=0
-SRC_URI=https://wci.llnl.gov/codes/silo/silo-4.9.1/silo-4.9.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=278c07dfb743f0f102a47820f9dd6966
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index e0724fe1d670..1f47c62ecf7f 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/xyscan-4.3.0 b/metadata/md5-cache/sci-visualization/xyscan-4.3.0
index ffdb92217e3f..5edbdca30391 100644
--- a/metadata/md5-cache/sci-visualization/xyscan-4.3.0
+++ b/metadata/md5-cache/sci-visualization/xyscan-4.3.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-text/poppler:=[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+DEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 DESCRIPTION=Tool for extracting data points from graphs
 EAPI=6
 HOMEPAGE=http://rhig.physics.yale.edu/~ullrich/software/xyscan/
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+RDEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=http://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/4.30/xyscan-4.30-src.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=86f10e0a1e2fa9c4462e6244a068c372
+_md5_=4f663c1d9f857ff5e40039a44e5aa1e6
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 9745b7c3f0a4..c3164c2d9f74 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/biosdisk-0_p20100611-r1 b/metadata/md5-cache/sys-apps/biosdisk-0_p20100611-r1
deleted file mode 100644
index aaa20c0e4782..000000000000
--- a/metadata/md5-cache/sys-apps/biosdisk-0_p20100611-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=A script that creates floppy boot images to flash Dell BIOSes
-EAPI=5
-HOMEPAGE=http://en.community.dell.com/techcenter/os-applications/w/wiki/linux-projects.aspx
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/dos2unix-5.0 sys-boot/syslinux 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_targets_python2_7
-SLOT=0
-SRC_URI=http://linux.dell.com/biosdisk/biosdisk-git-06112010.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6c9c3780c3ff0c842b54120e7828549a
diff --git a/metadata/md5-cache/sys-apps/biosdisk-0_p20171116 b/metadata/md5-cache/sys-apps/biosdisk-0_p20171116
new file mode 100644
index 000000000000..50340f9bb248
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/biosdisk-0_p20171116
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=A script that creates floppy boot images to flash Dell BIOSes
+EAPI=6
+HOMEPAGE=https://github.com/dell/biosdisk
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/dos2unix-5.0 sys-boot/syslinux 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_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/dell/biosdisk/archive/f534dd22a795dca9c42f44b52f206bf02eadb682.tar.gz -> biosdisk-0_p20171116.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=fb48b4a981605e9f53fd5c2f07dce73d
diff --git a/metadata/md5-cache/sys-apps/busybox-1.28.0 b/metadata/md5-cache/sys-apps/busybox-1.28.0
index f62a56a38d7e..467faa99f97f 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.28.0
+++ b/metadata/md5-cache/sys-apps/busybox-1.28.0
@@ -4,7 +4,7 @@ DESCRIPTION=Utilities for rescue and embedded systems
 EAPI=5
 HOMEPAGE=https://www.busybox.net/
 IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
-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=GPL-2
 RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) mdev? ( !<sys-apps/openrc-0.13 )
 REQUIRED_USE=pam? ( !static )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.28.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f36337b6ab5eaa5a3fc42be43c6ea985
+_md5_=a0d353d8a519b80718f47e62f94ae5d8
diff --git a/metadata/md5-cache/sys-apps/colorized-logs-2.3 b/metadata/md5-cache/sys-apps/colorized-logs-2.3
new file mode 100644
index 000000000000..576d9cd1cf74
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/colorized-logs-2.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Tools for logs with ANSI color
+EAPI=6
+HOMEPAGE=https://github.com/kilobyte/colorized-logs/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/kilobyte/colorized-logs/archive/v2.3.tar.gz -> colorized-logs-2.3.tar.gz
+_eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=488f8c68930e6b3aac33edd33986b326
diff --git a/metadata/md5-cache/sys-apps/dbus-1.10.24 b/metadata/md5-cache/sys-apps/dbus-1.10.24
index 96b7c76306e5..f4eb77dae6dc 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.10.24
+++ b/metadata/md5-cache/sys-apps/dbus-1.10.24
@@ -4,11 +4,11 @@ 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 ) selinux? ( sec-policy/selinux-dbus )
 REQUIRED_USE=?? ( elogind systemd ) test? ( debug )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.10.24.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=efa50ec99f78b0e67c2394f834ffc0c1
+_md5_=625211a41a7d31d61325839cd56cfb76
diff --git a/metadata/md5-cache/sys-apps/dmidecode-2.12-r1 b/metadata/md5-cache/sys-apps/dmidecode-2.12-r1
deleted file mode 100644
index fc80fa11eaca..000000000000
--- a/metadata/md5-cache/sys-apps/dmidecode-2.12-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile postinst prepare
-DESCRIPTION=DMI (Desktop Management Interface) table related utilities
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/dmidecode/
-IUSE=selinux
-KEYWORDS=-* amd64 arm 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-2.12.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=62994493718e7e05bc67a960344cbc5a
diff --git a/metadata/md5-cache/sys-apps/openrc-0.35.3 b/metadata/md5-cache/sys-apps/openrc-0.35.3
new file mode 100644
index 000000000000..5be80ea8bda6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.35.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=6
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.35.3.tar.gz -> openrc-0.35.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=86cce82348307b00e52749ecbe40db55
diff --git a/metadata/md5-cache/sys-apps/paludis-3.0.0_pre20170808 b/metadata/md5-cache/sys-apps/paludis-3.0.0_pre20170808
index 5d3f7af99beb..5651f536107e 100644
--- a/metadata/md5-cache/sys-apps/paludis-3.0.0_pre20170808
+++ b/metadata/md5-cache/sys-apps/paludis-3.0.0_pre20170808
@@ -4,7 +4,7 @@ DESCRIPTION=paludis, the other package mangler
 EAPI=6
 HOMEPAGE=http://paludis.exherbo.org/
 IUSE=doc pbins pink python ruby ruby_targets_ruby23 search-index test +xml python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2 vim
 PDEPEND=app-eselect/eselect-package-manager
 RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2:0 dev-libs/libpcre:=[cxx] sys-apps/file:= pbins? ( >=app-arch/libarchive-3.1.2:= ) python? ( 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-libs/boost-1.65:=[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(+)] ) ruby? ( dev-lang/ruby:2.3 ) search-index? ( >=dev-db/sqlite-3:= ) xml? ( >=dev-libs/libxml2-2.6:= ) sys-apps/sandbox
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://git.exherbo.org/paludis/paludis.git/snapshot/paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66f17f49d25e3c2ac3e73a6f40bb9991
+_md5_=9a57747c26521b52c8d92404bc68206c
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.24-r1 b/metadata/md5-cache/sys-apps/portage-2.3.24-r1
index 82640133d93e..a08fd5396bdd 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.24-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.24-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[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_python2_7? ( dev-python/pyblake2[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_4? ( dev-python/pyblake2[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_5? ( dev-python/pyblake2[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(-)] ) rsync-verify? ( >=app-portage/gemato-10 app-crypt/gentoo-keys >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,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(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.24.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.24.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c5928fd919b6d62141149492e35546b4
+_md5_=830a1581f0e5ccda876a2cf81e0b4ad6
diff --git a/metadata/md5-cache/sys-apps/sed-4.2.2 b/metadata/md5-cache/sys-apps/sed-4.2.2
index f3165f344300..17eaf0f775c2 100644
--- a/metadata/md5-cache/sys-apps/sed-4.2.2
+++ b/metadata/md5-cache/sys-apps/sed-4.2.2
@@ -10,4 +10,4 @@ RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libsel
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.2.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b6cb33860f13b60892a63831daa1f51
+_md5_=0ebece86cf7d45093a8bf6ea6120f40b
diff --git a/metadata/md5-cache/sys-apps/sed-4.3-r1 b/metadata/md5-cache/sys-apps/sed-4.3-r1
index c8928b0350ae..9bb6ce25ccd6 100644
--- a/metadata/md5-cache/sys-apps/sed-4.3-r1
+++ b/metadata/md5-cache/sys-apps/sed-4.3-r1
@@ -10,4 +10,4 @@ RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libsel
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b33e54c011752905394bdc38eb255a62
+_md5_=e3eaf1c1e58cd5a2a45cb9c88e7d914f
diff --git a/metadata/md5-cache/sys-apps/sed-4.4 b/metadata/md5-cache/sys-apps/sed-4.4
index 57cd9fc0e4cc..4b8c18c36310 100644
--- a/metadata/md5-cache/sys-apps/sed-4.4
+++ b/metadata/md5-cache/sys-apps/sed-4.4
@@ -10,4 +10,4 @@ RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libsel
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=035414426e25edb8b86cf21907f069e4
+_md5_=9ade15e46c8781acce6c2b2353074a74
diff --git a/metadata/md5-cache/sys-apps/sed-4.4-r1 b/metadata/md5-cache/sys-apps/sed-4.4-r1
index ace6e4f0d1bf..01ae4fb7dad5 100644
--- a/metadata/md5-cache/sys-apps/sed-4.4-r1
+++ b/metadata/md5-cache/sys-apps/sed-4.4-r1
@@ -10,4 +10,4 @@ RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libsel
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16011ad88b0603e0cb5050098d5cee64
+_md5_=9e08c60b0142646477201675b8f71b07
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 1beed8f73d2c..3d1637b4e45f 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/heat-9.0.2 b/metadata/md5-cache/sys-cluster/heat-9.0.2
deleted file mode 100644
index 1205e1e1d85b..000000000000
--- a/metadata/md5-cache/sys-cluster/heat-9.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup 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-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/pbr-2.1.0 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 ) 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 CloudFormation-compatible openstack-native cloud orchestration engine.
-EAPI=6
-HOMEPAGE=https://launchpad.net/heat
-IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=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(-)] !~dev-python/pbr-2.1.0 >=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(-)] !~dev-python/Babel-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/croniter-0.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(-)] >=dev-python/cryptography-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/cryptography-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/debtcollector-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/eventlet-0.18.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/eventlet-0.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/eventlet-0.21.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/keystoneauth-3.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/keystonemiddleware-4.12.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/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.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/netaddr-0.7.13[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/netaddr-0.7.16[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/openstacksdk-0.9.17[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-cache-1.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-config-4.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/oslo-config-4.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/oslo-config-4.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/oslo-concurrency-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/oslo-context-2.14.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-db-4.24.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-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-i18n-3.15.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/oslo-log-3.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-messaging-5.24.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/oslo-messaging-5.25.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-middleware-3.27.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-policy-1.23.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-reports-0.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/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-serialization-2.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/oslo-service-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.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/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/oslo-versionedobjects-1.17.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/pastedeploy-1.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/pycrypto-2.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/aodhclient-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/python-barbicanclient-4.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-barbicanclient-4.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/python-barbicanclient-4.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/python-ceilometerclient-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/python-cinderclient-3.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-designateclient-1.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/python-glanceclient-2.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-heatclient-1.6.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-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-magnumclient-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-manilaclient-1.12.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-mistralclient-3.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-monascaclient-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-neutronclient-6.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-novaclient-9.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-openstackclient-3.11.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-saharaclient-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/python-senlinclient-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/python-swiftclient-3.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/python-troveclient-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/python-zaqarclient-1.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-zunclient-0.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/pytz-2013.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/pyyaml-3.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.14.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/tenacity-3.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/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.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/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[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/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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/sqlalchemy-1.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(-)] ) postgres? ( >=dev-python/psycopg-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/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[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/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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/sqlalchemy-1.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/sqlalchemy-migrate-0.11.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/stevedore-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/webob-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/yaql-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(-)] 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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-9.0.2 https://tarballs.openstack.org/heat/heat-9.0.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0e56136e33e9665ef51555d915aff43
diff --git a/metadata/md5-cache/sys-cluster/heat-9.0.3 b/metadata/md5-cache/sys-cluster/heat-9.0.3
index 7843a398bf46..8a3ab9a0af47 100644
--- a/metadata/md5-cache/sys-cluster/heat-9.0.3
+++ b/metadata/md5-cache/sys-cluster/heat-9.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration eng
 EAPI=6
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=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(-)] !~dev-python/pbr-2.1.0 >=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(-)] !~dev-python/Babel-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/croniter-0.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(-)] >=dev-python/cryptography-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/cryptography-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/debtcollector-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/eventlet-0.18.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/eventlet-0.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/eventlet-0.21.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/keystoneauth-3.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/keystonemiddleware-4.12.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/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.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/netaddr-0.7.13[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/netaddr-0.7.16[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/openstacksdk-0.9.17[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-cache-1.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-config-4.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/oslo-config-4.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/oslo-config-4.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/oslo-concurrency-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/oslo-context-2.14.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-db-4.24.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-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-i18n-3.15.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/oslo-log-3.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-messaging-5.24.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/oslo-messaging-5.25.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-middleware-3.27.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-policy-1.23.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-reports-0.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/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-serialization-2.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/oslo-service-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.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/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/oslo-versionedobjects-1.17.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/pastedeploy-1.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/pycrypto-2.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/aodhclient-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/python-barbicanclient-4.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-barbicanclient-4.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/python-barbicanclient-4.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/python-ceilometerclient-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/python-cinderclient-3.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-designateclient-1.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/python-glanceclient-2.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-heatclient-1.6.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-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-magnumclient-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-manilaclient-1.12.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-mistralclient-3.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-monascaclient-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-neutronclient-6.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-novaclient-9.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-openstackclient-3.11.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-saharaclient-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/python-senlinclient-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/python-swiftclient-3.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/python-troveclient-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/python-zaqarclient-1.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-zunclient-0.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/pytz-2013.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/pyyaml-3.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.14.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/tenacity-3.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/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.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/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[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/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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/sqlalchemy-1.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(-)] ) postgres? ( >=dev-python/psycopg-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/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[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/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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/sqlalchemy-1.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/sqlalchemy-migrate-0.11.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/stevedore-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/webob-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/yaql-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(-)] 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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-9.0.3 https://tarballs.openstack.org/heat/heat-9.0.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=102805980c81443609021c291d3b7a78
+_md5_=3f358ea2c313bc9fc23277f93fab59cd
diff --git a/metadata/md5-cache/sys-cluster/slurm-16.05.11 b/metadata/md5-cache/sys-cluster/slurm-17.11.4
similarity index 88%
rename from metadata/md5-cache/sys-cluster/slurm-16.05.11
rename to metadata/md5-cache/sys-cluster/slurm-17.11.4
index f2be99615df9..8205e511da55 100644
--- a/metadata/md5-cache/sys-cluster/slurm-16.05.11
+++ b/metadata/md5-cache/sys-cluster/slurm-17.11.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
 DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) >=sys-apps/hwloc-1.1.1-r1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=
-DESCRIPTION=SLURM: A Highly Scalable Resource Manager
+DESCRIPTION=A Highly Scalable Resource Manager
 EAPI=6
 HOMEPAGE=https://www.schedmd.com
-IUSE=lua multiple-slurmd +munge mysql pam perl ssl static-libs torque
+IUSE=debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) >=sys-apps/hwloc-1.1.1-r1 dev-libs/libcgroup dev-lang/perl:=
 REQUIRED_USE=torque? ( perl )
 RESTRICT=primaryuri test
 SLOT=0
-SRC_URI=https://www.schedmd.com/download/latest/slurm-16.05.11.tar.bz2
+SRC_URI=https://download.schedmd.com/slurm/slurm-17.11.4.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b9eabbe65b963c52b44fa8641ca344bb
+_md5_=f84d5f4e46898a00b74bfd50303ee1c7
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 1ae859d69fc4..2fc40588eefb 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/automake-1.10.3-r3 b/metadata/md5-cache/sys-devel/automake-1.10.3-r3
index 4c1097dc41c6..71ea70092a4d 100644
--- a/metadata/md5-cache/sys-devel/automake-1.10.3-r3
+++ b/metadata/md5-cache/sys-devel/automake-1.10.3-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-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-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.10
 SRC_URI=mirror://gnu/automake/automake-1.10.3.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=61439081fd8c921b913e51f144905803
+_md5_=af709c1c0670672f605f7d81546ac0a2
diff --git a/metadata/md5-cache/sys-devel/automake-1.11.6-r3 b/metadata/md5-cache/sys-devel/automake-1.11.6-r3
index 821621c79ca9..736db9cef0e1 100644
--- a/metadata/md5-cache/sys-devel/automake-1.11.6-r3
+++ b/metadata/md5-cache/sys-devel/automake-1.11.6-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-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-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.11
 SRC_URI=mirror://gnu/automake/automake-1.11.6.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=734315bf7026576b0b1672125d6a6953
+_md5_=90b3c451d9514bf20ab559ac0eb28e9e
diff --git a/metadata/md5-cache/sys-devel/automake-1.12.6-r2 b/metadata/md5-cache/sys-devel/automake-1.12.6-r2
index 1a372a49e370..99a513092ede 100644
--- a/metadata/md5-cache/sys-devel/automake-1.12.6-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.12.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-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-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.12
 SRC_URI=mirror://gnu/automake/automake-1.12.6.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=402fbcef61361a15c6be1e7f417ca4e4
+_md5_=ab30f19568dff2f101816af071d63304
diff --git a/metadata/md5-cache/sys-devel/automake-1.13.4-r2 b/metadata/md5-cache/sys-devel/automake-1.13.4-r2
index 7bc3ff80b4fd..a952e66ca8dc 100644
--- a/metadata/md5-cache/sys-devel/automake-1.13.4-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.13.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-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=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.13
 SRC_URI=mirror://gnu/automake/automake-1.13.4.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ff59dafdcdca8d3f8aaf2cd8c9eb5eef
+_md5_=cc5bd4c5ac34d922c8bf6b3e64702547
diff --git a/metadata/md5-cache/sys-devel/automake-1.14.1-r2 b/metadata/md5-cache/sys-devel/automake-1.14.1-r2
index 068bb2b64656..7903aaf93446 100644
--- a/metadata/md5-cache/sys-devel/automake-1.14.1-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.14.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-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=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.14
 SRC_URI=mirror://gnu/automake/automake-1.14.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.14.1.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=47b36a27c745be9170d315cc4c83193b
+_md5_=1cacbc6b30a5faa08573e3ca4135c412
diff --git a/metadata/md5-cache/sys-devel/automake-1.15.1-r2 b/metadata/md5-cache/sys-devel/automake-1.15.1-r2
index 533222850eda..cefc6e1b4330 100644
--- a/metadata/md5-cache/sys-devel/automake-1.15.1-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.15.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-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=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.15
 SRC_URI=mirror://gnu/automake/automake-1.15.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.15.1.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bd560941920a099bdd68ffc313311cae
+_md5_=cb787aae5c09c31024be8190642f405f
diff --git a/metadata/md5-cache/sys-devel/automake-1.16.1 b/metadata/md5-cache/sys-devel/automake-1.16.1
new file mode 100644
index 000000000000..5f7277edc77a
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/automake-1.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Used to generate Makefile.in from Makefile.am
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/automake/
+IUSE=test
+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=GPL-2
+RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
+SLOT=1.16
+SRC_URI=mirror://gnu/automake/automake-1.16.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.16.1.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=0dabb346b3d60a636c888bafd19dc232
diff --git a/metadata/md5-cache/sys-devel/automake-1.9.6-r5 b/metadata/md5-cache/sys-devel/automake-1.9.6-r5
index 5124e27b152f..045c8ee15f09 100644
--- a/metadata/md5-cache/sys-devel/automake-1.9.6-r5
+++ b/metadata/md5-cache/sys-devel/automake-1.9.6-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-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-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* >=sys-apps/texinfo-4.7 sys-devel/gnuconfig
 SLOT=1.9
 SRC_URI=mirror://gnu/automake/automake-1.9.6.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=181a2442b6f3516011ba44da2dee31e2
+_md5_=1d37de2a3227200b3b535f5abe10d389
diff --git a/metadata/md5-cache/sys-devel/automake-9999 b/metadata/md5-cache/sys-devel/automake-9999
index fda9a6980734..976c3ef7055d 100644
--- a/metadata/md5-cache/sys-devel/automake-9999
+++ b/metadata/md5-cache/sys-devel/automake-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=9999
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=32a0cfbb2d2c64c8e1ae76042947f72b
+_md5_=0dabb346b3d60a636c888bafd19dc232
diff --git a/metadata/md5-cache/sys-devel/clang-6.0.0 b/metadata/md5-cache/sys-devel/clang-6.0.0
index 855fe4b328bd..b6888cb12204 100644
--- a/metadata/md5-cache/sys-devel/clang-6.0.0
+++ b/metadata/md5-cache/sys-devel/clang-6.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=C language family frontend for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 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 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 PDEPEND=~sys-devel/clang-runtime-6.0.0 default-compiler-rt? ( =sys-libs/compiler-rt-6.0.0* ) default-libcxx? ( >=sys-libs/libcxx-6.0.0 )
 RDEPEND=~sys-devel/llvm-6.0.0:6=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2: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(-)?] ) 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(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.0/cfe-6.0.0.src.tar.xz https://releases.llvm.org/6.0.0/clang-tools-extra-6.0.0.src.tar.xz test? ( https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.0-manpages.tar.bz2 )
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b37b5354d69fe8ffb92b14b0ff43478
+_md5_=e9a168e45c88f00fcbc8fcc8a817140b
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-6.0.0 b/metadata/md5-cache/sys-devel/clang-runtime-6.0.0
index 00fd57aca5ac..d8b88c6806de 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-6.0.0
+++ b/metadata/md5-cache/sys-devel/clang-runtime-6.0.0
@@ -3,10 +3,10 @@ DESCRIPTION=Meta-ebuild for clang runtime libraries
 EAPI=6
 HOMEPAGE=https://clang.llvm.org/
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-6.0.0:6.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-6.0.0:6.0.0 ) ) libcxx? ( >=sys-libs/libcxx-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(-)?] ) openmp? ( >=sys-libs/libomp-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(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=6.0.0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9ec038632fb38c08e3b87126dde00e4c
+_md5_=7716bc19e4283818ca7c0b50629b4b50
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.22.0 b/metadata/md5-cache/sys-devel/ct-ng-1.22.0
index 4917461f0b85..3b4c604c5a15 100644
--- a/metadata/md5-cache/sys-devel/ct-ng-1.22.0
+++ b/metadata/md5-cache/sys-devel/ct-ng-1.22.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install
 DESCRIPTION=crosstool-ng is a tool to build cross-compiling toolchains
 EAPI=5
-HOMEPAGE=http://crosstool-ng.org
+HOMEPAGE=https://crosstool-ng.github.io/
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=net-misc/curl <dev-util/gperf-3.1 dev-vcs/cvs dev-vcs/subversion
 SLOT=0
 SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=32589e6d574933514dd24cc7fcce5d81
+_md5_=21675d5ee5680713a099439356ca804c
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.23.0 b/metadata/md5-cache/sys-devel/ct-ng-1.23.0
index d2e2bb9e8a75..620488462002 100644
--- a/metadata/md5-cache/sys-devel/ct-ng-1.23.0
+++ b/metadata/md5-cache/sys-devel/ct-ng-1.23.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install
 DESCRIPTION=crosstool-ng is a tool to build cross-compiling toolchains
 EAPI=5
-HOMEPAGE=http://crosstool-ng.org
+HOMEPAGE=https://crosstool-ng.github.io/
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 SLOT=0
 SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.23.0.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f0f2d9096c5ab75e951f84c08f2524bd
+_md5_=2c22d059366d8db0ce47132d26660ed6
diff --git a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5 b/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5
index 0613646f1dfa..578a7b2dcc0e 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5
+++ b/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Distribute compilation of C code across several machines on a networ
 EAPI=6
 HOMEPAGE=http://distcc.org/
 IUSE=gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) !net-misc/pump dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://distcc.googlecode.com/files/distcc-3.2rc1.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6cf78a7c9215b4dc5154bbcdacf9a1e0
+_md5_=ae95b62eed6a241598f6fef156eb7fd5
diff --git a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10 b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
index 4c8f249a1951..8c06b7614972 100644
--- a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
+++ b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl )
 RESTRICT=strip
 SLOT=2.95.3
 SRC_URI=mirror://gnu/gcc/gcc-2.95.3/gcc-2.95.3.tar.bz2 mirror://gentoo/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-2.95.3-patches-1.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=812d2060d64ba720c343a27801254181
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
index ba089ba744e2..b13589c7658f 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl
 RESTRICT=strip
 SLOT=3.3.6
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-1.9.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=63f1d1e629319cdadc549e36aa390c53
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
index f42689cf8efe..36856ca7bb36 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d7dec1766720fc67e21b08bfe6022486
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4 b/metadata/md5-cache/sys-devel/gcc-4.0.4
index dbb3f8170f5a..04b790c7b08c 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.0.4
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-patches-1.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3dd4f8122c4cea5a0e80d9e034d8c6f3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index 82ffe95c8f64..30c5d84c1b8b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=624ba5f357ebde380fd7dcfcfda8449c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
index a5f7f723f01d..6a4f41e574f7 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=40eb7f3a89055031f38431809365bc09
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
index a5e7dd671f75..605a361d6a04 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.6
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=96b4ef1a01a77ed5ac862323a395109e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index 02f81c477548..ee919ad21397 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=dceb9c7c83221cc16d1e96976accad5e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4 b/metadata/md5-cache/sys-devel/gcc-4.5.4
index 04fbeacc8fad..015a4d877f5c 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=571cff20a06f6ff7c1aca3aaa417c068
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
index 6836af55d46b..256ab6208719 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0b8362c82ddcd2644cca03e1d286bbaa
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
index f7fbf371d370..dfb63638509e 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b7c4348c5456f94428a7c422251a1f18
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r1 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
index 7b6b158c72ec..f8e4dd2764e9 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5208fe90a7af46207bca10b23ea935ac
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4 b/metadata/md5-cache/sys-devel/gcc-4.9.4
index 2297fefd5451..d896398a4b38 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2c051e9cf5eb44aa3fdb596e4e1c7c83
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
index 810894b9ccbd..e02bf7fc730c 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
@@ -7,9 +7,9 @@ IUSE=regression-test vanilla altivec debug nopie nossp doc gcj awt hardened mult
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14 )
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.8.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8b617c83460b0f4d7d4b401964f7e6fd
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0 b/metadata/md5-cache/sys-devel/gcc-6.4.0
index 074a166bdb16..db6a8a7ad141 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
@@ -7,9 +7,9 @@ IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pg
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14 )
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=3206ab220c7e4972f79f2cf6d752ed44
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
index 154a871db7cd..ca6e89769765 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
@@ -7,9 +7,9 @@ IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pg
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14 )
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e8c07f4b3f1057325c5297a300d7a3e3
diff --git a/metadata/md5-cache/sys-devel/gcc-7.2.0 b/metadata/md5-cache/sys-devel/gcc-7.2.0
index 72f6b818da94..779e612180bd 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.2.0
+++ b/metadata/md5-cache/sys-devel/gcc-7.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
@@ -7,9 +7,9 @@ IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pg
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 )
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=7.2.0
 SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=736e7bd7626edc2324234c96d980766d
diff --git a/metadata/md5-cache/sys-devel/gcc-7.2.0-r1 b/metadata/md5-cache/sys-devel/gcc-7.2.0-r1
index b659de2621ac..cd2781ea08d8 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.2.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-7.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
@@ -7,9 +7,9 @@ IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pg
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 )
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=7.2.0
 SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.2.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ff8f2926e26d1aa4a4d1ad0074723605
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0 b/metadata/md5-cache/sys-devel/gcc-7.3.0
index 1728a87ffcef..03acb2ac1185 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
@@ -7,9 +7,9 @@ IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pg
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 )
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=681cecfe88134d678b6607f2fc5610eb
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r1 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r1
index 78be902fed90..cf77c4cef6c8 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 )
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c0dc8bffc1dd679bbec53954da2eba3d
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index fa9dc2dde5e0..4e434815ca62 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d1d79b3b67c2326bbc79509b553a94b0
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index 9f04cf181e44..974bb91d2f32 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4287b0b7f9ce8b6865f6948812501cc8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index f7943100b08f..44b9a7327d49 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b6f206f7701d664aa14a87c3585f0ddd
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index 1b08eee68b26..e48995bca697 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.5
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ec6572a5964dbd4fb0e9b408ab1a4906
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index f5e0cdae99a8..bc0f204ebc92 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=885ff8764444180b5b9468b039d1d6c7
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index edce00d82e9f..662b0615add2 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7c248eb43f85d6e92aa0d3da6bb4643e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index b8a48b14e940..258c5523e542 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5.3
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=bc38515ddf23da9bea281583fd294e01
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.4 b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
index 8c20e3949f4b..60c9a3f689a3 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=66fb8a6b7789b020c7ec831ff6734136
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.4 b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
index b8598d3f9027..6f7ccb2c6b22 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=72222fd69b078160875299e54f945848
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.3 b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
index f197e3b7c2fa..af835bd50fcf 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7.3
 SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-patches-1.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e5f7f7adb1120b7069c7bff6460186eb
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.4 b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
index 7b4e55005f69..9aa3d0d08ab4 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f12ff1dddfea91247a92f36600960ad6
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.3 b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
index 4366e0832eb8..f3fd7229d3e1 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8.3
 SRC_URI=mirror://gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.3-patches-1.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8471dd65776a9de1df31e6ac5983dbd4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.5 b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
index f768c7111de5..fcbc12dfaf94 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5be437344c8ffaae90c70c4fdd9ddc60
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.4 b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
index 09d61b848e15..33f2d421682d 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-5.4.0 b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
index 06bf0787c916..d4b97aab6bac 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-5.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.3.0 b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
index 0e02c13073f2..acf8779ce760 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=dd30e381df3740b88e76ffa3e5a8933e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.4.0 b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
index e5b07863e634..13c20a0d1981 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.2.0 b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
index 672a1db5cac8..eacf44673cf1 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=7.2.0
 SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.1.0-patches-1.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cebaf5a44a3f27a06d34b25f117ec3f4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.3.0 b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
index d784f926d44b..c662466af931 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	e5597cc3568ebe13909e4f1fa0a50240	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	34879ed5801233725ef8190e7c35b60c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f98c36a1ee211609b51b9550d5ec4aa4
diff --git a/metadata/md5-cache/sys-devel/lld-6.0.0 b/metadata/md5-cache/sys-devel/lld-6.0.0
index 547ff2a51b52..379ff57ec5ee 100644
--- a/metadata/md5-cache/sys-devel/lld-6.0.0
+++ b/metadata/md5-cache/sys-devel/lld-6.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-6.0.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/lld-6.0.0.src.tar.xz test? ( https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz )
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a73153a658a4ee8dde06afdca21c6541
+_md5_=0952bdc1087491bebc82ee2536060965
diff --git a/metadata/md5-cache/sys-devel/llvm-6.0.0 b/metadata/md5-cache/sys-devel/llvm-6.0.0
index 07092c1daa33..a55d50f7e1c8 100644
--- a/metadata/md5-cache/sys-devel/llvm-6.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-6.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Low Level Virtual Machine
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug doc gold libedit +libffi ncurses test xar xml kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-6 )
 RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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-devel/llvm:0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.0-manpages.tar.bz2 )
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36ab3f1d8150ab79af50b0c5b745ccbb
+_md5_=80319427d16aee534268002a9de873c9
diff --git a/metadata/md5-cache/sys-devel/llvm-common-6.0.0 b/metadata/md5-cache/sys-devel/llvm-common-6.0.0
index b577cdb3fb7c..375592755b77 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-6.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-6.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=Common files shared between multiple slots of LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz
-_md5_=e673f642d90627b721e71f71117367ef
+_md5_=5d05b8cd54fff66fff4ad033eb980c26
diff --git a/metadata/md5-cache/sys-devel/llvmgold-6 b/metadata/md5-cache/sys-devel/llvmgold-6
index 5b12dd903f2e..9cbd5990c057 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-6
+++ b/metadata/md5-cache/sys-devel/llvmgold-6
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=6
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:6[gold] !sys-devel/llvm:0
 SLOT=0
-_md5_=2674e16cde8b597e957b6b598e7b6e3a
+_md5_=2dc9c4b469c152ab7de2be1836da5245
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index bc6e8c64aaed..0fddd710717c 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/fuseiso-20070708-r1 b/metadata/md5-cache/sys-fs/fuseiso-20070708-r1
deleted file mode 100644
index 3e20c34512cb..000000000000
--- a/metadata/md5-cache/sys-fs/fuseiso-20070708-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-fs/fuse sys-libs/zlib dev-libs/glib:2 virtual/pkgconfig
-DESCRIPTION=Fuse module to mount ISO9660
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/fuseiso
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/fuse sys-libs/zlib dev-libs/glib:2
-SLOT=0
-SRC_URI=http://superb-dca2.dl.sourceforge.net/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=995120322389cf2d79e12efe5b851626
diff --git a/metadata/md5-cache/sys-fs/fuseiso-20070708-r2 b/metadata/md5-cache/sys-fs/fuseiso-20070708-r2
new file mode 100644
index 000000000000..8a64108bcae0
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fuseiso-20070708-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-fs/fuse:= sys-libs/zlib dev-libs/glib:2 virtual/pkgconfig
+DESCRIPTION=Fuse module to mount ISO9660
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/fuseiso
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/fuse:= sys-libs/zlib dev-libs/glib:2
+SLOT=0
+SRC_URI=http://superb-dca2.dl.sourceforge.net/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2
+_md5_=e7fab62c7ba225e77074e16b3c17978e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index ab3ee597b710..006155e9a765 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.26 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.26
new file mode 100644
index 000000000000..1533cd8ffc06
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+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
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.26
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-31.base.tar.xz mirror://gentoo/genpatches-4.14-31.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-31.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=722b26de27a802e39296d5fcd6294169
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.9
new file mode 100644
index 000000000000..5910b1176fe5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.15 kernel tree
+EAPI=6
+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
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.15.9
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz mirror://gentoo/genpatches-4.15-12.base.tar.xz mirror://gentoo/genpatches-4.15-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-12.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=75b97a3269c2fa01c5551ac4c2b75ea3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.121 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.121
new file mode 100644
index 000000000000..d222f046b18f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.121
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+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
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.121
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-125.base.tar.xz mirror://gentoo/genpatches-4.4-125.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-125.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=8961fea78504ca54306309ce57de9ab7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.87 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.87
new file mode 100644
index 000000000000..b9b7bb1adc22
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.87
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+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
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.87
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-90.base.tar.xz mirror://gentoo/genpatches-4.9-90.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-90.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=795b75e7e96d68281eaecea938bc9137
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.16_rc5 b/metadata/md5-cache/sys-kernel/git-sources-4.16_rc5
new file mode 100644
index 000000000000..e98c71d92e5b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.16_rc5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16_rc5
+SRC_URI=https://git.kernel.org/torvalds/p/v4.16-rc5/v4.15 -> patch-4.16-rc5.patch mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f574e23ca6bde475eeea1dd06b588440
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.4.8-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-4.4.8-r1
index 4ee37c5da0f6..1767b5c08c1a 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.4.8-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.4.8-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
 DESCRIPTION=Hardened kernel sources (kernel series 4.4)
 EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+HOMEPAGE=https://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( linux-firmware )
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.4.8-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-4.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-check -> deblob-check-4.4 ) https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.4.8-2.extras.tar.bz2 mirror://gentoo/genpatches-4.4-9.base.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ad2d819b1b354d5d016231dd87bc1ef4
+_md5_=a508409c558358eecaa0f01ee6ecb4ef
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.7.10 b/metadata/md5-cache/sys-kernel/hardened-sources-4.7.10
index 248d36c98675..fc76ef3decb6 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.7.10
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.7.10
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
 DESCRIPTION=Hardened kernel sources (kernel series 4.7)
 EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+HOMEPAGE=https://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( linux-firmware )
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.7.10
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.7.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.7-gnu/deblob-4.7 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.7-gnu/deblob-check -> deblob-check-4.7 ) https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.7.10-1.extras.tar.bz2 mirror://gentoo/genpatches-4.7-8.base.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=eb572d0966292cfbf5604f71190e9b17
+_md5_=4479647f93aa720d30476b422b753f05
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.7.6 b/metadata/md5-cache/sys-kernel/hardened-sources-4.7.6
index 0b4eccdd0844..393b448268b3 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.7.6
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.7.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
 DESCRIPTION=Hardened kernel sources (kernel series 4.7)
 EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+HOMEPAGE=https://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( linux-firmware )
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.7.6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.7.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.7-gnu/deblob-4.7 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.7-gnu/deblob-check -> deblob-check-4.7 ) https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.7.6-1.extras.tar.bz2 mirror://gentoo/genpatches-4.7-6.base.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4b4e0514060b49619416538e6a3e9fd9
+_md5_=7838d520848b3e2cb58971e5d64286e5
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.8.17-r2 b/metadata/md5-cache/sys-kernel/hardened-sources-4.8.17-r2
index 06aa4efe1fdf..1e170779bc68 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.8.17-r2
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.8.17-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
 DESCRIPTION=Hardened kernel sources (kernel series 4.8)
 EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+HOMEPAGE=https://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( linux-firmware )
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.8.17-r2
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.8-gnu/deblob-4.8 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.8-gnu/deblob-check -> deblob-check-4.8 ) https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.8.17-3.extras.tar.bz2 mirror://gentoo/genpatches-4.8-18.base.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c429ad2a759beab77a23b00bfb3caf9b
+_md5_=fc86678e9f6085c25c0b4e9001436d12
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.9.21 b/metadata/md5-cache/sys-kernel/hardened-sources-4.9.21
index 3a34f339375c..51da18c86f54 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.9.21
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.9.21
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
 DESCRIPTION=Hardened kernel sources (kernel series 4.9)
 EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+HOMEPAGE=https://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( linux-firmware )
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.9.21
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.9.21-1.extras.tar.bz2 mirror://gentoo/genpatches-4.9-21.base.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4e8f46af9f81a5087e1f4a3328900e8a
+_md5_=559349b7a7f349a828571b7772d3b0da
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.9.22 b/metadata/md5-cache/sys-kernel/hardened-sources-4.9.22
index b019a4278b11..8104fc716f23 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.9.22
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.9.22
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
 DESCRIPTION=Hardened kernel sources (kernel series 4.9)
 EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+HOMEPAGE=https://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( linux-firmware )
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.9.22
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.9.22-1.extras.tar.bz2 mirror://gentoo/genpatches-4.9-23.base.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=49126a8b317fb80b2dfdc192b6774c38
+_md5_=6a4f690b334ecfcffd9c6eb632fe22e2
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.9.23 b/metadata/md5-cache/sys-kernel/hardened-sources-4.9.23
index f3e9bd24a8b5..708006b38583 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.9.23
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.9.23
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
 DESCRIPTION=Hardened kernel sources (kernel series 4.9)
 EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+HOMEPAGE=https://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( linux-firmware )
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.9.23
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.9.23-1.extras.tar.bz2 mirror://gentoo/genpatches-4.9-23.base.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=49126a8b317fb80b2dfdc192b6774c38
+_md5_=6a4f690b334ecfcffd9c6eb632fe22e2
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.9.24 b/metadata/md5-cache/sys-kernel/hardened-sources-4.9.24
index 45bd4b457244..22d29741e15c 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.9.24
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.9.24
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
 DESCRIPTION=Hardened kernel sources (kernel series 4.9)
 EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+HOMEPAGE=https://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( linux-firmware )
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.9.24
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) https://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.9.24-1.extras.tar.bz2 mirror://gentoo/genpatches-4.9-24.base.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b328ef2eded23c2881719ecae91121d8
+_md5_=315c4d9ad806e4c30420d9bf99c3b029
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.25 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.26
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.25
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.26
index 000a1f7b9ba7..833706752f38 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.25
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.26
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.14.25
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.25.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.26
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.26.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.15.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.15.9
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.15.8
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.15.9
index 495e1c2bda19..bd22a3887562 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.15.8
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.15.9
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.15.8
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.15.8.xz mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz
+SLOT=4.15.9
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.15.9.xz mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.120 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.121
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.4.120
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.4.121
index a02784ba0835..9736e838f2ba 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.120
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.121
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.4.120
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.120.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+SLOT=4.4.121
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.121.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.86 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.87
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.86
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.87
index f86288234c35..8c22f25d8734 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.86
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.87
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.9.86
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.86.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.87
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.87.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index c9916c231dce..7f678989b206 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-6.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-6.0.0
index b420ab86b562..99ad5969e01e 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-6.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-6.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=6.0.0
 SRC_URI=https://releases.llvm.org/6.0.0/compiler-rt-6.0.0.src.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bf4da1e5b4bd54bdc3cc77eaf30f1310
+_md5_=81d54e4dd89eae621d8e96baa3bfce31
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.0
index 754587ac6a16..7bbc7d552dab 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=6.0.0
 SRC_URI=https://releases.llvm.org/6.0.0/compiler-rt-6.0.0.src.tar.xz test? ( https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz )
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=89029bd8efc579a6938ab916fbb19096
+_md5_=2d179d51f16dfe3cf0745a40843e5f07
diff --git a/metadata/md5-cache/sys-libs/libcxx-6.0.0 b/metadata/md5-cache/sys-libs/libcxx-6.0.0
index 3d5e7fdb83b6..8b31f8124e0d 100644
--- a/metadata/md5-cache/sys-libs/libcxx-6.0.0
+++ b/metadata/md5-cache/sys-libs/libcxx-6.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=New implementation of the C++ standard library, targeting C++11
 EAPI=6
 HOMEPAGE=https://libcxx.llvm.org/
 IUSE=elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs 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=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-6.0.0[libunwind=,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(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,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(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/libcxx-6.0.0.src.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6fd650deb54cfea49c9dd615276d1db4
+_md5_=e584b19882e7afeb5a61f6553c855948
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-6.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-6.0.0
index 13a66dd30d39..a59b74d8cd60 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-6.0.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-6.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Low level support for a standard C++ library
 EAPI=6
 HOMEPAGE=https://libcxxabi.llvm.org/
 IUSE=+libunwind +static-libs 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=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[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(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/libcxxabi-6.0.0.src.tar.xz https://releases.llvm.org/6.0.0/libcxx-6.0.0.src.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a8d6893cbf812545dd5a4173709bacf
+_md5_=bafa83cb49f259fbe2f8ba04e07b0217
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20140322 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20140322
deleted file mode 100644
index 819f6f80cc09..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20140322
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=libunwind? ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] ) app-arch/xz-utils
-DESCRIPTION=C++ Runtime from PathScale, FreeBSD and NetBSD
-EAPI=5
-HOMEPAGE=https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265
-IUSE=libunwind 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=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=libunwind? ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] )
-SLOT=0
-SRC_URI=mirror://gentoo/libcxxrt-0.0_p20140322.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=65b2238a09b7e39e5b7b634f5cdf966f
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20150423-r1 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20150423-r1
deleted file mode 100644
index 546f4ea23498..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20150423-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] sys-libs/llvm-libunwind[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(-)?] ) ) app-arch/xz-utils
-DESCRIPTION=C++ Runtime from PathScale, FreeBSD and NetBSD
-EAPI=5
-HOMEPAGE=https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265
-IUSE=libunwind +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=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] sys-libs/llvm-libunwind[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(-)?] ) )
-SLOT=0
-SRC_URI=mirror://gentoo/libcxxrt-0.0_p20150423.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ebfce3e8cccf603a918e4ac5f9ec7311
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20160922 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311
similarity index 81%
rename from metadata/md5-cache/sys-libs/libcxxrt-0.0_p20160922
rename to metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311
index 16d7835340a1..d617c224cb8c 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20160922
+++ b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] sys-libs/llvm-libunwind[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(-)?] ) ) app-arch/xz-utils
 DESCRIPTION=C++ Runtime from PathScale, FreeBSD and NetBSD
 EAPI=5
 HOMEPAGE=https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265
-IUSE=libunwind +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=amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+IUSE=+libunwind +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=~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] sys-libs/llvm-libunwind[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(-)?] ) )
 SLOT=0
-SRC_URI=mirror://gentoo/libcxxrt-0.0_p20160922.tar.xz
+SRC_URI=mirror://gentoo/libcxxrt-0.0_p20180311.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88ea046cfb52f7865dffd54a2fa36dc6
+_md5_=2cc95e0476d294b6a0129bc557a9f0c8
diff --git a/metadata/md5-cache/sys-libs/libomp-6.0.0 b/metadata/md5-cache/sys-libs/libomp-6.0.0
index fb9d53fe5882..29ce74155f25 100644
--- a/metadata/md5-cache/sys-libs/libomp-6.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-6.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=6
 HOMEPAGE=https://openmp.llvm.org
 IUSE=cuda hwloc kernel_linux offload ompt 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=~amd64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos
 LICENSE=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
 RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-sdk:= ) )
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/openmp-6.0.0.src.tar.xz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8e2610939b9c5f4b0942bc1f3de03e4
+_md5_=6ad84de53b5d3922efaba687317c90cd
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.0
index 181dd1437c61..1793e517ffeb 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-6.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=C++ runtime stack unwinder from LLVM
 EAPI=6
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
 IUSE=debug +static-libs 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=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.0/libunwind-6.0.0.src.tar.xz test? ( https://releases.llvm.org/6.0.0/libcxx-6.0.0.src.tar.xz )
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d447a64f332fcef18471587ece5a0b0b
+_md5_=b5df3fd1b3cf3ccae5cc7682c4cea4c9
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 47c5110fce41..4fe16644c4fc 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/time-1.9 b/metadata/md5-cache/sys-process/time-1.9
new file mode 100644
index 000000000000..35c305cff489
--- /dev/null
+++ b/metadata/md5-cache/sys-process/time-1.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=sys-apps/texinfo
+DESCRIPTION=Displays info about resources used by a program
+EAPI=6
+HOMEPAGE=https://www.gnu.org/directory/time.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=http://ftp.gnu.org/pub/gnu/time/time-1.9.tar.gz
+_md5_=da101b5920edc548f937c45574a60e29
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index b5a3c0b3c1f0..9acb876726b0 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/python-pathlib-1.0 b/metadata/md5-cache/virtual/python-pathlib-1.0
index 12089d249972..eb8e04284890 100644
--- a/metadata/md5-cache/virtual/python-pathlib-1.0
+++ b/metadata/md5-cache/virtual/python-pathlib-1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for Python pathlib module
 EAPI=5
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 ia64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ia64 ~ppc ppc64 x86
 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(-)] python_targets_pypy? ( dev-python/pathlib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/pathlib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 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
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bcf50052622012935eb3e0418146c096
+_md5_=3abd774de26b170530e22e9d6e00793e
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index d3fad605be1d..40b2ff3a3747 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/kibana-bin-5.6.6 b/metadata/md5-cache/www-apps/kibana-bin-5.6.8
similarity index 95%
rename from metadata/md5-cache/www-apps/kibana-bin-5.6.6
rename to metadata/md5-cache/www-apps/kibana-bin-5.6.8
index 7c3149b2c5f2..67955f2405c8 100644
--- a/metadata/md5-cache/www-apps/kibana-bin-5.6.6
+++ b/metadata/md5-cache/www-apps/kibana-bin-5.6.8
@@ -6,6 +6,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB
 RDEPEND=net-libs/nodejs
 SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/kibana/kibana-5.6.6-linux-x86_64.tar.gz
+SRC_URI=https://artifacts.elastic.co/downloads/kibana/kibana-5.6.8-linux-x86_64.tar.gz
 _eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=df661a215e62b44866ad28acb34e086c
diff --git a/metadata/md5-cache/www-apps/kibana-bin-6.2.2 b/metadata/md5-cache/www-apps/kibana-bin-6.2.2
new file mode 100644
index 000000000000..5bdab6223811
--- /dev/null
+++ b/metadata/md5-cache/www-apps/kibana-bin-6.2.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare setup
+DESCRIPTION=Analytics and search dashboard for Elasticsearch
+EAPI=6
+HOMEPAGE=https://www.elastic.co/products/kibana
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB
+RDEPEND=net-libs/nodejs
+SLOT=0
+SRC_URI=https://artifacts.elastic.co/downloads/kibana/kibana-6.2.2-linux-x86_64.tar.gz
+_eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=df661a215e62b44866ad28acb34e086c
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index e8ca12d3f6a5..7310a042958e 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-64.0.3282.167 b/metadata/md5-cache/www-client/chromium-64.0.3282.167
deleted file mode 100644
index 8d1094a58905..000000000000
--- a/metadata/md5-cache/www-client/chromium-64.0.3282.167
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=6
-HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.167.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e1b0a4eb92f61d0f0597baf33907b43
diff --git a/metadata/md5-cache/www-client/chromium-64.0.3282.186 b/metadata/md5-cache/www-client/chromium-66.0.3359.22
similarity index 86%
rename from metadata/md5-cache/www-client/chromium-64.0.3282.186
rename to metadata/md5-cache/www-client/chromium-66.0.3359.22
index 23d1ac18ed25..f7455177c3c4 100644
--- a/metadata/md5-cache/www-client/chromium-64.0.3282.186
+++ b/metadata/md5-cache/www-client/chromium-66.0.3359.22
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/clang-5 virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=6
 HOMEPAGE=http://chromium.org/
 IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.186.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-66.0.3359.22.tar.xz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e1b0a4eb92f61d0f0597baf33907b43
+_md5_=c3a7422f3487469cc959ffbf1d0e52b4
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-66.0.3359.22 b/metadata/md5-cache/www-client/google-chrome-unstable-66.0.3359.26
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-unstable-66.0.3359.22
rename to metadata/md5-cache/www-client/google-chrome-unstable-66.0.3359.26
index 8a5946c2ac1f..e91e7dac32df 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-66.0.3359.22
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-66.0.3359.26
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_66.0.3359.22-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_66.0.3359.26-1_amd64.deb
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f3bf237a83ecd802a636b64a7996448
diff --git a/metadata/md5-cache/www-client/opera-developer-53.0.2880.0 b/metadata/md5-cache/www-client/opera-developer-53.0.2893.0
similarity index 83%
rename from metadata/md5-cache/www-client/opera-developer-53.0.2880.0
rename to metadata/md5-cache/www-client/opera-developer-53.0.2893.0
index a6841c3c504c..66c08b45e3e6 100644
--- a/metadata/md5-cache/www-client/opera-developer-53.0.2880.0
+++ b/metadata/md5-cache/www-client/opera-developer-53.0.2893.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/53.0.2880.0/linux/opera-developer_53.0.2880.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/53.0.2880.0/linux/opera-developer_53.0.2880.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/53.0.2880.0/linux/opera-developer_53.0.2880.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/53.0.2880.0/linux/opera-developer_53.0.2880.0_amd64.deb )
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/53.0.2893.0/linux/opera-developer_53.0.2893.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/53.0.2893.0/linux/opera-developer_53.0.2893.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/53.0.2893.0/linux/opera-developer_53.0.2893.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/53.0.2893.0/linux/opera-developer_53.0.2893.0_amd64.deb )
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fa0a012555bec1bb5e09a23f4458261d
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.0.4 b/metadata/md5-cache/www-client/qutebrowser-1.2.0
similarity index 97%
rename from metadata/md5-cache/www-client/qutebrowser-1.0.4
rename to metadata/md5-cache/www-client/qutebrowser-1.2.0
index 236c4016b9c7..94859ed20eaf 100644
--- a/metadata/md5-cache/www-client/qutebrowser-1.0.4
+++ b/metadata/md5-cache/www-client/qutebrowser-1.2.0
@@ -10,6 +10,6 @@ RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.0.4/qutebrowser-1.0.4.tar.gz
+SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.2.0/qutebrowser-1.2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5bba232b330035fe6b7235358120f7e6
+_md5_=4649ad2b7da150f7c82044597fc91630
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 46d638889d79..69190ef21e85 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.22_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.26_alpha
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.22_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.26_alpha
index 747aebe5eeec..33a8bc9cafe8 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.22_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.26_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_66.0.3359.22-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_66.0.3359.26-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 35d2f356fb88..1c0256459aec 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/varnish-4.0.5 b/metadata/md5-cache/www-servers/varnish-4.0.5
index da7836d71c70..5dbd0ca72e13 100644
--- a/metadata/md5-cache/www-servers/varnish-4.0.5
+++ b/metadata/md5-cache/www-servers/varnish-4.0.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
 EAPI=6
-HOMEPAGE=http://www.varnish-cache.org/
+HOMEPAGE=https://varnish-cache.org/
 IUSE=jemalloc jit static-libs python_targets_pypy python_targets_python2_7 python_targets_python3_4
 KEYWORDS=amd64 ~mips x86
 LICENSE=BSD-2 GPL-2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://varnish-cache.org/_downloads/varnish-4.0.5.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=319a2854cfba3c6283464d2bc43d32ad
+_md5_=984ec372a3f973beee0f498e7c6a8930
diff --git a/metadata/md5-cache/www-servers/varnish-4.1.8 b/metadata/md5-cache/www-servers/varnish-4.1.8
index 6f58dce1187e..ae393def495f 100644
--- a/metadata/md5-cache/www-servers/varnish-4.1.8
+++ b/metadata/md5-cache/www-servers/varnish-4.1.8
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
 EAPI=6
-HOMEPAGE=http://www.varnish-cache.org/
+HOMEPAGE=https://varnish-cache.org/
 IUSE=jemalloc jit static-libs python_targets_pypy python_targets_python2_7 python_targets_python3_4
 KEYWORDS=amd64 ~mips ~ppc ~ppc64 x86
 LICENSE=BSD-2 GPL-2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://varnish-cache.org/_downloads/varnish-4.1.8.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=e574c564475003c20e8e6e2711957085
+_md5_=f0a1d3a78fd4d9c7cff5f8474fcc7dbd
diff --git a/metadata/md5-cache/www-servers/varnish-5.1.3 b/metadata/md5-cache/www-servers/varnish-5.1.3
index 103ff2f8cdc1..4a1721cf17c8 100644
--- a/metadata/md5-cache/www-servers/varnish-5.1.3
+++ b/metadata/md5-cache/www-servers/varnish-5.1.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
 EAPI=6
-HOMEPAGE=http://www.varnish-cache.org/
+HOMEPAGE=https://varnish-cache.org/
 IUSE=jemalloc jit static-libs python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~mips ~ppc ~ppc64 x86
 LICENSE=BSD-2 GPL-2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://varnish-cache.org/_downloads/varnish-5.1.3.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d515d1e9546a645fd65a3d6df9e13539
+_md5_=c6a5102fbd33ef41d834d9e62c2001a2
diff --git a/metadata/md5-cache/www-servers/varnish-5.2.1 b/metadata/md5-cache/www-servers/varnish-5.2.1
index ebf13c8d6cd6..1bceb6ba4c12 100644
--- a/metadata/md5-cache/www-servers/varnish-5.2.1
+++ b/metadata/md5-cache/www-servers/varnish-5.2.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
 EAPI=6
-HOMEPAGE=http://www.varnish-cache.org/
+HOMEPAGE=https://varnish-cache.org/
 IUSE=jemalloc jit static-libs python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD-2 GPL-2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://varnish-cache.org/_downloads/varnish-5.2.1.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=376dba0ca7c4b954f4bc1d55e59d6b25
+_md5_=2a1a5bdf7ab7a2ebc497f86f513c17af
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 3c314ab4ee6d..6ca9357b33e6 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20171018 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20171018
index 4c1c687ef693..58b64dd142b8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20171018
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20171018
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/4798e18b2b2c8b0a05dc967e6140fd9962bc1a73.tar.xz -> xf86-video-intel-2.99.917_p20171018.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=502dc39594f92baf356cdab3945a568e
+_md5_=8b3e447543106954ac2ab6c9f9cdce75
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index ace54912372c..2159b2f4f0f8 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/cairo-1.14.12 b/metadata/md5-cache/x11-libs/cairo-1.14.12
index 70253a9d2b5b..1eb389a9204a 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.14.12
+++ b/metadata/md5-cache/x11-libs/cairo-1.14.12
@@ -4,7 +4,7 @@ DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=6
 HOMEPAGE=https://www.cairographics.org
 IUSE=X aqua debug gles2 +glib opengl static-libs +svg valgrind xcb abi_x86_32 abi_x86_64 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/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(-)?] >=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(-)?] >=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(-)?] sys-libs/binutils-libs: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/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(-)?] >=x11-libs/pixman-0.32.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(-)?] gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.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/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/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(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 REQUIRED_USE=gles2? ( !opengl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.cairographics.org/releases/cairo-1.14.12.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=961862f77ec309fae1a1a4b3a5cf911c
+_md5_=fe6e859efb0adf87322f5c3a71c30a67
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
index 3b61632069ea..0d1e7d0c185b 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
@@ -4,10 +4,10 @@ DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
 IUSE=X debug +introspection jpeg jpeg2k tiff 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.48.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(-)?] >=media-libs/libpng-1.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg: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(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2: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(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.11.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cbbaf75187400a4f14903cc7e90c057d
+_md5_=ad8fd107276e4dff78413ae6d6eabc03
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.12-r2 b/metadata/md5-cache/x11-libs/libxcb-1.12-r2
index 10c6c603f7d3..a0d007fb2ebc 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.12-r2
+++ b/metadata/md5-cache/x11-libs/libxcb-1.12-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=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(-)?] >=x11-libs/libXau-1.0.7-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/libXdmcp-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(-)?] test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) dev-libs/libxslt || ( dev-lang/python:3.6[xml] dev-lang/python:3.5[xml] dev-lang/python:3.4[xml] >=dev-lang/python-2.7.5-r2:2.7[xml] ) || ( ( dev-lang/python:3.6[xml] >=x11-proto/xcb-proto-1.12-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_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5[xml] >=x11-proto/xcb-proto-1.12-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_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4[xml] >=x11-proto/xcb-proto-1.12-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_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=x11-proto/xcb-proto-1.12-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_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=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(-)?] >=x11-libs/libXau-1.0.7-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/libXdmcp-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(-)?] test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) dev-libs/libxslt || ( dev-lang/python:3.6[xml] dev-lang/python:3.5[xml] dev-lang/python:3.4[xml] >=dev-lang/python-2.7.5-r2:2.7[xml] ) || ( ( dev-lang/python:3.6[xml] ~x11-proto/xcb-proto-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(-)?,python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5[xml] ~x11-proto/xcb-proto-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(-)?,python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4[xml] ~x11-proto/xcb-proto-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(-)?,python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[xml] ~x11-proto/xcb-proto-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(-)?,python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings library
 EAPI=5
 HOMEPAGE=https://xcb.freedesktop.org/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 SLOT=0/1.12
 SRC_URI=https://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=3bb34202bcae43aac5ee8bc7cf398e52
+_md5_=7d70e59f2ccece56808319fb28f8dca3
diff --git a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1 b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
index 8bf0f0332390..c6bbd18fa64a 100644
--- a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
+++ b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sound? ( dev-qt/qtmultimedia:5 ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Multi platform Qt notification framework
 EAPI=6
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 de
 SLOT=0
 SRC_URI=mirror://kde/stable/snorenotify/0.7.0/src/snorenotify-0.7.0.tar.xz
 _eclasses_=cmake-utils	5af1e1540847474085b8af891dc0793c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=517fe932597ce26da971a9def99e73b5
+_md5_=f5180b072d0b2bc426c597790476e171
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index b5739d0e1c4b..c22957f1b87a 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/qt5ct-0.33 b/metadata/md5-cache/x11-misc/qt5ct-0.35
similarity index 71%
rename from metadata/md5-cache/x11-misc/qt5ct-0.33
rename to metadata/md5-cache/x11-misc/qt5ct-0.35
index 396096d19334..f1421225e1b0 100644
--- a/metadata/md5-cache/x11-misc/qt5ct-0.33
+++ b/metadata/md5-cache/x11-misc/qt5ct-0.35
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 >=dev-qt/qtgui-5.7:5[dbus] ) dev-qt/linguist-tools:5
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] ) dev-qt/linguist-tools:5
 DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/qt5ct/
 IUSE=+dbus
 KEYWORDS=~amd64
 LICENSE=BSD-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 >=dev-qt/qtgui-5.7:5[dbus] )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
 SLOT=0
-SRC_URI=mirror://sourceforge/qt5ct/qt5ct-0.33.tar.bz2
+SRC_URI=mirror://sourceforge/qt5ct/qt5ct-0.35.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7b1621b9cd4302491bdf13e244dd61d3
+_md5_=3e34e1015924d0baaca805ba489d4fea
diff --git a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1 b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
index 799049789163..82c8eec5684b 100644
--- a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
+++ b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jordansissel/xdotool/releases/download/v3.20160805.1/xdotool-3.20160805.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=42f7c22b7ca30be7fb70a51ae061ef73
+_md5_=2653caa38ed7afc447df238e5643ebe4
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c3a442fef94a..19aef3166834 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Mar 2018 12:38:29 +0000
+Tue, 13 Mar 2018 19:38:12 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 03700af769df..eb797fdb2ec1 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Mar 11 12:38:28 UTC 2018
+Tue Mar 13 19:38:12 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 510d82e451ea..8d09fc655413 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Mar 2018 13:00:01 +0000
+Tue, 13 Mar 2018 20:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d437c0fd89ff..2bb54a9a5ff7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-62279dde8cc911ffd5e89b5fd2baed7356c336c1 1520771502 2018-03-11T12:31:42+00:00
+1468cceff64ccc9f21535d8bbec1a7b22963cb71 1520969732 2018-03-13T19:35:32+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ab08ad479958..3c503b2a34ad 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1520771701 Sun 11 Mar 2018 12:35:01 PM UTC
+1520969702 Tue 13 Mar 2018 07:35:02 PM UTC
diff --git a/metadata/xml-schema/Manifest.gz b/metadata/xml-schema/Manifest.gz
index 5dfde36ab122..ef592afb5af6 100644
Binary files a/metadata/xml-schema/Manifest.gz and b/metadata/xml-schema/Manifest.gz differ
diff --git a/metadata/xml-schema/metadata.xsd b/metadata/xml-schema/metadata.xsd
index cad830485bbc..8b8ac0b56cd7 100644
--- a/metadata/xml-schema/metadata.xsd
+++ b/metadata/xml-schema/metadata.xsd
@@ -20,6 +20,10 @@
 			<xs:selector xpath='slots'/>
 			<xs:field xpath='@lang'/>
 		</xs:unique>
+		<xs:unique name='stabilizeAllArchesUniquityConstraint'>
+			<xs:selector xpath='stabilize-all-arches'/>
+			<xs:field xpath='@restrict'/>
+		</xs:unique>
 		<xs:unique name='upstreamSingleConstraint'>
 			<xs:selector xpath='upstream'/>
 			<xs:field xpath='@fake-only-once'/>
@@ -60,6 +64,7 @@
 					<xs:field xpath='@fake-only-once'/>
 				</xs:unique>
 			</xs:element>
+			<xs:element name='stabilize-allarches' type='stabilizeAllArchesType'/>
 			<xs:element name='upstream' type='upstreamType'>
 				<xs:unique name='upstreamMaintainerUniquityConstraint'>
 					<xs:selector xpath='maintainer'/>
@@ -203,6 +208,12 @@
 		</xs:restriction>
 	</xs:simpleType>
 
+	<!-- stabilize-allarches -->
+	<xs:complexType name='stabilizeAllArchesType'>
+		<xs:attribute name='restrict' type='restrictAttrType'
+			default=''/>
+	</xs:complexType>
+
 	<!-- use flags -->
 	<xs:complexType name='useType'>
 		<xs:choice minOccurs='0' maxOccurs='unbounded'>
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7f39f15d20b7..19aef3166834 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Mar 2018 12:38:28 +0000
+Tue, 13 Mar 2018 19:38:12 +0000
diff --git a/metadata/xml-schema/timestamp.commit b/metadata/xml-schema/timestamp.commit
index 86e63e274c97..80fc4922cd6f 100644
--- a/metadata/xml-schema/timestamp.commit
+++ b/metadata/xml-schema/timestamp.commit
@@ -1 +1 @@
-1ccfac1cd1254d1c1922158bdfab6c002f668340 1491580231 2017-04-07T15:50:31+00:00
+8536b990542049f4c81e1e616dd8d5c909266a66 1520927068 2018-03-13T07:44:28+00:00
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f084d33d796f..8f88f7ce6081 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.confd b/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.confd
index e80d6a1a8504..c5e56a67e15e 100644
--- a/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.confd
+++ b/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.confd
@@ -1,2 +1,2 @@
 # arguments for prometheus snmp exporter
-command_args="--config-file=/etc/snmp_exporter/snmp.yml"
+command_args="--config.file=/etc/snmp_exporter/snmp.yml"
diff --git a/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd b/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd
index 4d620b54b171..b214422704e2 100644
--- a/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd
+++ b/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
+# Copyright 2016-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Prometheus snmp exporter"
@@ -8,7 +8,7 @@ user=${user:-${RC_SVCNAME}}
 group=${group:-${RC_SVCNAME}}
 
 command="/usr/bin/snmp_exporter"
-command_args="${command_args:---config-file=/etc/snmp_exporter/snmp.yml}"
+command_args="${command_args:---config.file=/etc/snmp_exporter/snmp.yml}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/snmp_exporter/${RC_SVCNAME}.log \
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 95d58fe75e81..0f9abaa083a6 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
index 8f27cb6d7738..d12c0f175d95 100644
--- a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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/bind-9.11.2_p1.ebuild b/net-dns/bind/bind-9.11.2_p1.ebuild
index 541a4744b78c..e69fa9cf9ec6 100644
--- a/net-dns/bind/bind-9.11.2_p1.ebuild
+++ b/net-dns/bind/bind-9.11.2_p1.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.
 
 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
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.6.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.6.ebuild
index 4176fce8ebbc..d5b792bf7d31 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.6.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 PATCHES=( "${FILESDIR}"/config-full-paths-r3.patch )
diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild b/net-dns/libidn/libidn-1.33-r2.ebuild
index e98daa3439ac..03d490b1a431 100644
--- a/net-dns/libidn/libidn-1.33-r2.ebuild
+++ b/net-dns/libidn/libidn-1.33-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 884596168a98..28980b2497bb 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9ed6714c814c..cc997fb76763 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,12 +1,9 @@
 DIST samba-4.2.14.tar.gz 20883281 BLAKE2B 90bff4ef0752b952e2e31b6e86223ae7e785248ef01b15d6a26f0912452cbfdb1e828b88c81c8b6d36e1e2ca7d79a00ffd196625eb6ee96b587483a25044fd47 SHA512 269dd74ba788657434f51ac70953a293c94bcf98280eaa6f44634c5da54169a5ea7865d543a7c23860c4750a40cdee7caeaf5c7fc3dbc137f444e90f31a09890
-DIST samba-4.5.10.tar.gz 20989431 BLAKE2B 564d7c98dad101e74be1d54790abd3907b502ad1bdb7322be4853370dd6877a8f5604fec967555cf048978cbcb5a4ad111810657dcc8a58d0cea2843dfcd29ff SHA512 046bae9c66083a4fe656d6a7b02b64343c66e0ea4925193a898dbda107b5b158d1897f16c36f4c393a30457a49215fa6ef91720367f4946760ec48ce02a4a68a
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.15.tar.gz 21020181 BLAKE2B 0d113c4d3147102e2cc192a14d145c46930b8f772683bc27e90b264e43c5660298e468c494de41e80fb2dcd80a0dbef0b9ce1f74dc9e89eca52865ceba605382 SHA512 e77d746767d55ff933cddbb4d6e0f97f0b12e630c564852bee02f5f9764633167f1c098df7606af2a1930a9bdd4665fb79d7748ff07532db4e9a581fb639450c
-DIST samba-4.6.12.tar.gz 21160637 BLAKE2B b12046423f103883fd2d9b5ce12af2bea25c2b26bf8c039619359b789e675f963aec044e11443a8f6a865ea8564d58fe12d5268f00d71c9544e1abd27e9647f7 SHA512 e45a6ee43bcb2fba224bf38771d30daace46ad92b05f580a261aaacf7de9eca3d71cb4f4b2f956d83d84df489cb6f015b3b7abb42702ed2936bf92faa945340c
-DIST samba-4.6.13.tar.gz 21160952 BLAKE2B 6d7927f00c8d013f8ce702168f5810fb112b0e89f3e298178d6e7bf98f0cb8182e54eb9efe2b74c41d16af751ced0a536e08c93b0527c5c88502b7e1f908042b SHA512 bc6ef2558cbdd3d093f5d29e5a79b069b6a4dabdad4becaf0010514c5d67646f5e6ec8d8dbefa1e6ba7891b3e0eb728bcb91522ba910947f90841437b9fe7dda
+DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
+DIST samba-4.6.14.tar.gz 21161954 BLAKE2B e514c23f46679ba0415b91ada99e0263f123df6b1b76e5e1ead67ab248bb38cdc2e20107a71630b7c31305b3b2b72526b2b16758f048e7c1a0810af7f4fa09f7 SHA512 a235f5932d7ec2cad22c841ae5138c5bc5a8bce0fe2327146a7f34d9abb46656b323d66c490d0058bbf0831a5b5fa328722e0566155d430e3a180440be1c70d3
 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
-DIST samba-4.7.4.tar.gz 16853555 BLAKE2B 3907b9ecb55f3ff02cec8bfac6e7410595ccc77baef27a2ec12ebbb94e66860497a60b4c6166bf39e580a5e4c5233780bb8117dc1498e722ac34185bd0ccde7b SHA512 50af2ed0586116171b2fabb96a05118c447cd5a165a5328b02be832fda9eb1465052a6670415831484639921164ddbf03b6ec47857244cc164ea5a9e4e39cf65
-DIST samba-4.7.5.tar.gz 16862398 BLAKE2B dd5fc044e70483dc04e423ee8221afaeb90b1bfaf4ace434000b89d28248b4d9c73a11c15acca31e4b81d27b89f789b59de3da4e27faa4fa5eb025cde112e824 SHA512 1cd70ebbe59e467701e6607147d19492c3fdad99371aa182ded9e4e2f37a53c76c04e796725bd747e5e1fb882bfb73d82a0d26f25de5ef135266d33be9f7fb61
+DIST samba-4.7.6.tar.gz 16864824 BLAKE2B 0c519f83e95f9ef9ff13c6a4998d0c98e67765253e855386febe20f836873b10e94161d1539d24af835f464d56edd7f5595abd30b8d6b039cd8ba887563394b1 SHA512 8190b06f543cc3d4a9a98f93ad5e4e16e4e87ea462435723044a780942cea7efc77c66cd3e61941bf449a2ac0f4346ced378f032d5fb1776280a3c4bcb951b46
 DIST samba-4.8.0rc4.tar.gz 17662979 BLAKE2B bcafc3e26062ad31ae8cd946fabf1fbfa0d2f83c497ffa49e40e943314f98dca9920d3ccf6cdcd29e5cd4bcdd66b01791cc1dc233f655f88b1590477d45940b6 SHA512 dddcce6933bd7126e2bda0554f5702974d094dcff70487189f497824a2f6ca567bc3c8637dce6c60d444b040ce3fd144a6ec045cf5ddc2d13dfe3470e0de251b
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
-DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927
diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild
index 67fef98bf874..8fa65156a539 100644
--- a/net-fs/samba/samba-4.2.14.ebuild
+++ b/net-fs/samba/samba-4.2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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.2.12.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="arm hppa"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/samba/samba-4.5.15.ebuild b/net-fs/samba/samba-4.5.15.ebuild
index 93a8316ec33d..66526019e604 100644
--- a/net-fs/samba/samba-4.5.15.ebuild
+++ b/net-fs/samba/samba-4.5.15.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-4.5.11-disable-python-patches.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-fs/samba/samba-4.5.10-r1.ebuild b/net-fs/samba/samba-4.5.16.ebuild
similarity index 89%
rename from net-fs/samba/samba-4.5.10-r1.ebuild
rename to net-fs/samba/samba-4.5.16.ebuild
index fe9661d17a0d..e4e3fd4b0bbe 100644
--- a/net-fs/samba/samba-4.5.10-r1.ebuild
+++ b/net-fs/samba/samba-4.5.16.ebuild
@@ -14,12 +14,12 @@ SRC_PATH="stable"
 [[ ${PV} = *_rc* ]] && SRC_PATH="rc"
 
 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"
+	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
+HOMEPAGE="http://www.samba.org/"
 LICENSE="GPL-3"
 
 SLOT="0"
@@ -27,6 +27,12 @@ SLOT="0"
 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"
 
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
 	/usr/include/samba-4.0/dcerpc_server.h
@@ -49,6 +55,7 @@ CDEPEND="${PYTHON_DEPS}
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
 	>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
@@ -78,12 +85,10 @@ DEPEND="${CDEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig
 	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
+		>=sys-libs/nss_wrapper-1.1.3
+		>=net-dns/resolv_wrapper-1.1.4
+		>=net-libs/socket_wrapper-1.1.7
+		>=sys-libs/uid_wrapper-1.2.1
 	)"
 RDEPEND="${CDEPEND}
 	client? ( net-fs/cifs-utils[ads?] )
@@ -139,7 +144,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
+	# when specifying libs for samba build you must append NONE to the end to 
 	# stop it automatically including things
 	local bundled_libs="NONE"
 	if ! use system-heimdal && ! use system-mitkrb5 ; then
@@ -235,7 +240,7 @@ multilib_src_install() {
 
 		# create symlink for cups (bug #552310)
 		if use cups ; then
-			dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
 		fi
 
 		# install example config file
@@ -277,7 +282,7 @@ pkg_postinst() {
 	ewarn "controller work previously known as 'samba4'."
 
 	elog "For further information and migration steps make sure to read "
-	elog "https://www.samba.org/samba/history/${P}.html "
-	elog "https://www.samba.org/samba/history/${PN}-4.5.0.html and"
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
 }
diff --git a/net-fs/samba/samba-4.6.12.ebuild b/net-fs/samba/samba-4.6.12.ebuild
deleted file mode 100644
index 89f52e0eaf41..000000000000
--- a/net-fs/samba/samba-4.6.12.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.12[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( virtual/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	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[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 )
-	test? ( python )
-	addns? ( python )
-	ads? ( acl gnutls ldap )
-	gpg? ( addc )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# install the patches from tarball(s)
-	eapply "${WORKDIR}/patches"
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to 
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=()
-	myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			$(use_with acl acl-support)
-			$(usex addc '' '--without-ad-dc')
-			$(use_with addns dnsupdate)
-			$(use_with ads)
-			$(use_enable ceph cephfs)
-			$(use_with cluster cluster-support)
-			$(use_enable cups)
-			$(use_with debug lttng)
-			$(use_with dmapi)
-			$(use_with fam)
-			$(use_enable gnutls)
-			$(use_with gpg gpgme)
-			$(use_enable iprint)
-			$(use_with ldap)
-			$(use_with pam)
-			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-			$(use_with quota quotas)
-			$(use_with syslog)
-			$(use_with systemd)
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			$(use_with winbind)
-			$(usex python '' '--disable-python')
-			$(usex test '--enable-selftest' '')
-			$(use_enable zeroconf avahi)
-			--with-shared-modules=${SHAREDMODS}
-		)
-	else
-		myconf+=(
-			--without-acl-support
-			--without-ad-dc
-			--without-dnsupdate
-			--without-ads
-			--disable-avahi
-			--disable-cephfs
-			--without-cluster-support
-			--disable-cups
-			--without-dmapi
-			--without-fam
-			--disable-gnutls
-			--without-gpgme
-			--disable-iprint
-			$(use_with ldap)
-			$(use_with debug lttng)
-			--without-pam
-			--without-quotas
-			--without-syslog
-			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			--without-winbind
-			--disable-python
-		)
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.6.13.ebuild b/net-fs/samba/samba-4.6.14.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.6.13.ebuild
rename to net-fs/samba/samba-4.6.14.ebuild
diff --git a/net-fs/samba/samba-4.7.4.ebuild b/net-fs/samba/samba-4.7.4.ebuild
deleted file mode 100644
index 791413f4a91c..000000000000
--- a/net-fs/samba/samba-4.7.4.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( virtual/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	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[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="addc? ( python gnutls )
-	test? ( python )
-	addns? ( python )
-	ads? ( acl gnutls ldap )
-	gpg? ( addc )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}"/talloc-disable-python.patch
-	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
-	"${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
-	"${FILESDIR}/${P}-no_ads.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to 
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=()
-	myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			$(use_with acl acl-support)
-			$(usex addc '' '--without-ad-dc')
-			$(use_with addns dnsupdate)
-			$(use_with ads)
-			$(use_enable ceph cephfs)
-			$(use_with cluster cluster-support)
-			$(use_enable cups)
-			$(use_with debug lttng)
-			$(use_with dmapi)
-			$(use_with fam)
-			$(use_enable gnutls)
-			$(use_with gpg gpgme)
-			$(use_enable iprint)
-			$(use_with ldap)
-			$(use_with pam)
-			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-			$(use_with quota quotas)
-			$(use_with syslog)
-			$(use_with systemd)
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			$(use_with winbind)
-			$(usex python '' '--disable-python')
-			$(usex test '--enable-selftest' '')
-			$(use_enable zeroconf avahi)
-			--with-shared-modules=${SHAREDMODS}
-		)
-	else
-		myconf+=(
-			--without-acl-support
-			--without-ad-dc
-			--without-dnsupdate
-			--without-ads
-			--disable-avahi
-			--disable-cephfs
-			--without-cluster-support
-			--disable-cups
-			--without-dmapi
-			--without-fam
-			--disable-gnutls
-			--without-gpgme
-			--disable-iprint
-			$(use_with ldap)
-			$(use_with debug lttng)
-			--without-pam
-			--without-quotas
-			--without-syslog
-			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			--without-winbind
-			--disable-python
-		)
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.7.5.ebuild b/net-fs/samba/samba-4.7.6.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.7.5.ebuild
rename to net-fs/samba/samba-4.7.6.ebuild
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index d1f0f2788275..53ab80a427f1 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
index a107dd71b69b..52f9787ecc7e 100644
--- a/net-irc/anope/metadata.xml
+++ b/net-irc/anope/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<longdescription>Anope IRC Services</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">anope</remote-id>
diff --git a/net-irc/ircservices/metadata.xml b/net-irc/ircservices/metadata.xml
index db6fa3b9dde5..097975e3adc2 100644
--- a/net-irc/ircservices/metadata.xml
+++ b/net-irc/ircservices/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml
index fc7667fe9321..99886fc47cc4 100644
--- a/net-irc/psybnc/metadata.xml
+++ b/net-irc/psybnc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<use>
 		<flag name="oidentd">Adds support for oidentd</flag>
 		<flag name="scripting">Adds scripting support</flag>
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 960017cf87ee..cf1ee2a1f333 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch b/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch
new file mode 100644
index 000000000000..d9226d697000
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch
@@ -0,0 +1,30 @@
+From 310d423d36ae7bb6dac5a2ae2fb7b57bda72dcb5 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Thu, 24 Aug 2017 17:27:08 +0200
+Subject: [PATCH 1/2] priv: Add macro for MAX
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+(cherry picked from commit de35212789d11086621e176a11399de0d75ab3a6)
+Signed-off-by: Mihai Moldovan <ionic@ionic.de>
+---
+ include/libssh/priv.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/libssh/priv.h b/include/libssh/priv.h
+index 5a74915e..c3373c00 100644
+--- a/include/libssh/priv.h
++++ b/include/libssh/priv.h
+@@ -263,6 +263,10 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
+ #define MIN(a,b) ((a) < (b) ? (a) : (b))
+ #endif
+ 
++#ifndef MAX
++#define MAX(a,b) ((a) > (b) ? (a) : (b))
++#endif
++
+ /** Free memory space */
+ #define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
+ 
+-- 
+2.15.1
+
diff --git a/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch b/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch
new file mode 100644
index 000000000000..931d63360a12
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch
@@ -0,0 +1,156 @@
+From 4893f9515da2696490e6bbe9aaf51f2ef9678b0f Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@redhat.com>
+Date: Thu, 24 Aug 2017 16:28:39 +0200
+Subject: [PATCH 2/2] ssh_options_set_algo: ensure we only set known algorithms
+ internally
+
+That way, we will not fail later on key exchange phase when something
+unknown is negotiated.
+
+Fixes T37
+
+Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
+Reviewed-by: Andreas Schneider <asn@samba.org>
+(cherry picked from commit 895055ab38e7716390019aae5e11771a88b99d26)
+Signed-off-by: Mihai Moldovan <ionic@ionic.de>
+---
+ include/libssh/kex.h |  1 +
+ src/kex.c            | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/options.c        | 11 ++++----
+ 3 files changed, 81 insertions(+), 6 deletions(-)
+
+diff --git a/include/libssh/kex.h b/include/libssh/kex.h
+index 1a5b6d41..23594985 100644
+--- a/include/libssh/kex.h
++++ b/include/libssh/kex.h
+@@ -41,6 +41,7 @@ void ssh_list_kex(struct ssh_kex_struct *kex);
+ int set_client_kex(ssh_session session);
+ int ssh_kex_select_methods(ssh_session session);
+ int verify_existing_algo(int algo, const char *name);
++char *keep_known_algos(int algo, const char *list);
+ char **space_tokenize(const char *chain);
+ int ssh_get_kex1(ssh_session session);
+ char *ssh_find_matching(const char *in_d, const char *what_d);
+diff --git a/src/kex.c b/src/kex.c
+index 519d79ce..f0c9d067 100644
+--- a/src/kex.c
++++ b/src/kex.c
+@@ -281,6 +281,71 @@ char *ssh_find_matching(const char *available_d, const char *preferred_d){
+     return NULL;
+ }
+ 
++static char *ssh_find_all_matching(const char *available_d,
++                                   const char *preferred_d)
++{
++    char **tok_available, **tok_preferred;
++    int i_avail, i_pref;
++    char *ret;
++    unsigned max, len, pos = 0;
++
++    if ((available_d == NULL) || (preferred_d == NULL)) {
++        return NULL; /* don't deal with null args */
++    }
++
++    max = MAX(strlen(available_d), strlen(preferred_d));
++
++    ret = malloc(max+1);
++    if (ret == NULL) {
++      return NULL;
++    }
++    ret[0] = 0;
++
++    tok_available = tokenize(available_d);
++    if (tok_available == NULL) {
++        SAFE_FREE(ret);
++        return NULL;
++    }
++
++    tok_preferred = tokenize(preferred_d);
++    if (tok_preferred == NULL) {
++        SAFE_FREE(ret);
++        SAFE_FREE(tok_available[0]);
++        SAFE_FREE(tok_available);
++        return NULL;
++    }
++
++    for (i_pref = 0; tok_preferred[i_pref] ; ++i_pref) {
++        for (i_avail = 0; tok_available[i_avail]; ++i_avail) {
++            int cmp = strcmp(tok_available[i_avail],tok_preferred[i_pref]);
++            if (cmp == 0) {
++                /* match */
++                if (pos != 0) {
++                    ret[pos] = ',';
++                    pos++;
++                }
++
++                len = strlen(tok_available[i_avail]);
++                memcpy(&ret[pos], tok_available[i_avail], len);
++                pos += len;
++                ret[pos] = '\0';
++            }
++        }
++    }
++
++    if (ret[0] == '\0') {
++        SAFE_FREE(ret);
++        ret = NULL;
++    }
++
++    SAFE_FREE(tok_available[0]);
++    SAFE_FREE(tok_preferred[0]);
++    SAFE_FREE(tok_available);
++    SAFE_FREE(tok_preferred);
++
++    return ret;
++}
++
+ /**
+  * @internal
+  * @brief returns whether the first client key exchange algorithm or
+@@ -668,4 +733,14 @@ int verify_existing_algo(int algo, const char *name){
+     return 0;
+ }
+ 
++/* returns a copy of the provided list if everything is supported,
++ * otherwise a new list of the supported algorithms */
++char *keep_known_algos(int algo, const char *list)
++{
++    if ((algo > 9) || (algo < 0)) {
++        return NULL;
++    }
++
++    return ssh_find_all_matching(supported_methods[algo], list);
++}
+ /* vim: set ts=2 sw=2 et cindent: */
+diff --git a/src/options.c b/src/options.c
+index aed2dda5..34fe9cc7 100644
+--- a/src/options.c
++++ b/src/options.c
+@@ -164,7 +164,10 @@ int ssh_options_copy(ssh_session src, ssh_session *dest) {
+ 
+ int ssh_options_set_algo(ssh_session session, int algo,
+     const char *list) {
+-  if (!verify_existing_algo(algo, list)) {
++  char *p = NULL;
++
++  p = keep_known_algos(algo, list);
++  if (p == NULL) {
+     ssh_set_error(session, SSH_REQUEST_DENIED,
+         "Setting method: no algorithm for method \"%s\" (%s)\n",
+         ssh_kex_get_description(algo), list);
+@@ -172,11 +175,7 @@ int ssh_options_set_algo(ssh_session session, int algo,
+   }
+ 
+   SAFE_FREE(session->opts.wanted_methods[algo]);
+-  session->opts.wanted_methods[algo] = strdup(list);
+-  if (session->opts.wanted_methods[algo] == NULL) {
+-    ssh_set_error_oom(session);
+-    return -1;
+-  }
++  session->opts.wanted_methods[algo] = p;
+ 
+   return 0;
+ }
+-- 
+2.15.1
+
diff --git a/net-libs/libssh/libssh-0.7.5-r2.ebuild b/net-libs/libssh/libssh-0.7.5-r2.ebuild
new file mode 100644
index 000000000000..381d0dd66c08
--- /dev/null
+++ b/net-libs/libssh/libssh-0.7.5-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-${PV/_rc/rc}"
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/"
+SRC_URI="https://red.libssh.org/attachments/download/218/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+	!gcrypt? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-tests.patch
+	"${FILESDIR}"/${P}-fix-config-parsing.patch
+	"${FILESDIR}"/${P}-fix-config-buffer-underflow.patch
+	"${FILESDIR}"/${P}-add-macro-for-MAX.patch
+	"${FILESDIR}"/${P}-fix-internal-algo-selection.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# just install the examples do not compile them
+	sed -i \
+		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+		CMakeLists.txt || die
+
+	# keyfile torture test is currently broken
+	sed -i \
+		-e '/torture_keyfiles/d' \
+		tests/unittests/CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
+		-DWITH_DEBUG_CRYPTO="$(usex debug)"
+		-DWITH_GCRYPT="$(usex gcrypt)"
+		-DWITH_GSSAPI="$(usex gssapi)"
+		-DWITH_NACL=no
+		-DWITH_PCAP="$(usex pcap)"
+		-DWITH_SERVER="$(usex server)"
+		-DWITH_SFTP="$(usex sftp)"
+		-DWITH_SSH1="$(usex ssh1)"
+		-DWITH_STATIC_LIB="$(usex static-libs)"
+		-DWITH_STATIC_LIB="$(usex test)"
+		-DWITH_TESTING="$(usex test)"
+		-DWITH_ZLIB="$(usex zlib)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	if multilib_is_native_abi && use doc ; then
+		docinto html
+		dodoc -r doc/html/.
+	fi
+
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}
diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
index 53c42dd90258..2c151ee1ce2b 100644
--- a/net-libs/libupnp/metadata.xml
+++ b/net-libs/libupnp/metadata.xml
@@ -5,10 +5,6 @@
     <email>thev00d00@gentoo.org</email>
     <name>Ian Whyman</name>
   </maintainer>
-  <maintainer type="person">
-    <email>gurligebis@gentoo.org</email>
-    <name>Bjarke Istrup Pedersen</name>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">pupnp</remote-id>
     <remote-id type="github">mrjimenez/pupnp</remote-id>
diff --git a/net-libs/mbedtls/mbedtls-2.7.1.ebuild b/net-libs/mbedtls/mbedtls-2.7.1.ebuild
index 783c6747fdda..da4240ebb05c 100644
--- a/net-libs/mbedtls/mbedtls-2.7.1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.7.1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/10" # slot for libmbedtls.so
-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="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
 
 RDEPEND="
diff --git a/net-libs/pjproject/pjproject-2.7.1.ebuild b/net-libs/pjproject/pjproject-2.7.1.ebuild
index e4d25565824a..ce4a363c5017 100644
--- a/net-libs/pjproject/pjproject-2.7.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="http://www.pjsip.org/"
 SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 6b78673354f2..9d9e0ee67dde 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/dovecot/dovecot-2.2.34.ebuild b/net-mail/dovecot/dovecot-2.2.34.ebuild
index 021cb8adcb55..50e365cae941 100644
--- a/net-mail/dovecot/dovecot-2.2.34.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.34.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 23938d956f31..d78824f01f16 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/asterisk/asterisk-13.19.0-r1.ebuild b/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
index e0b88a37696c..ac2f2b5f6ecd 100644
--- a/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
 	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index cd7650e8bb87..dfbf259894c2 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 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="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest
index 2e64bedf6ba9..378e3f307b40 100644
--- a/net-misc/eventd/Manifest
+++ b/net-misc/eventd/Manifest
@@ -1,2 +1,2 @@
 DIST eventd-0.21.0.tar.xz 392080 BLAKE2B 14d01d46e07e650f392abca53716c1fd5a5d70f05fe006e8a230d38be610e36ee0369742d258b46697376317be4ff6a071166a45528ef2840159a1024057d6cc SHA512 5907d453c493c9f2332df506037027ef7df021b1e29a6773cf8bb5c32c7a301b65ca55d3e3ea40982d3e48b837738c97b5420309a45a550f409d8912636d1dae
-DIST eventd-0.23.0_p20171112.tgz 239548 BLAKE2B 690b25f04aec4796117178c0fced9b46aa3b223d8c7c91bdd5dc3623759448c5012985ab5b6de0d24db8e19071f8e66f4f9014f7e7111a65256ad29d593606bb SHA512 1a8409d1292a237db7bc7c10e70b4b1c34e5bd0c7bac1bf144e288dd69718c48041066d190b75ea73670db6031b296d0697b2e41136fbe20878975351c6e8bab
+DIST eventd-0.24.0.tar.xz 184140 BLAKE2B 496b91b595d391ab056298b63a75df7be1a7362b960308d24bd950fefa2084d3b1eb04fb45f25cca11116d922ecb835b3f8545e7b3c5099261bc9872a157098f SHA512 204383140a0b6baf23ba148b525de7bcb90bdedd3be9e6cd7e8ce4222a689cd6cdeae8e29afa612afe3fbf8cec68f9bbdff74e826a04ff892e51d6fd4bba2cf2
diff --git a/net-misc/eventd/eventd-0.23.0_p20171112.ebuild b/net-misc/eventd/eventd-0.24.0.ebuild
similarity index 91%
rename from net-misc/eventd/eventd-0.23.0_p20171112.ebuild
rename to net-misc/eventd/eventd-0.24.0.ebuild
index 94cc96e2e9c8..4580e0a092fb 100644
--- a/net-misc/eventd/eventd-0.23.0_p20171112.ebuild
+++ b/net-misc/eventd/eventd-0.24.0.ebuild
@@ -7,7 +7,7 @@ inherit linux-info meson systemd xdg-utils
 
 DESCRIPTION="A small daemon to act on remote or local events"
 HOMEPAGE="https://www.eventd.org/"
-SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tgz"
+SRC_URI="https://www.eventd.org/download/eventd/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+ MIT"
 SLOT="0"
@@ -79,7 +79,7 @@ src_prepare() {
 }
 
 eventd_use_enable() {
-	echo "-Denable-${2:-${1}}=$(usex ${1} 'true' 'false')" || die
+	echo "-D${2:-${1}}=$(usex ${1} 'true' 'false')" || die
 }
 
 src_configure() {
@@ -95,7 +95,7 @@ src_configure() {
 		$(eventd_use_enable notification notification-daemon)
 		# Wayland plugin requires wayland-wall, which is currently WIP.
 		# See https://github.com/wayland-wall/wayland-wall/issues/1
-		-Denable-nd-wayland="false"
+		-Dnd-wayland="false"
 		$(eventd_use_enable X nd-xcb)
 		$(eventd_use_enable fbcon nd-fbdev)
 		$(eventd_use_enable purple im)
@@ -111,7 +111,9 @@ src_configure() {
 }
 
 src_test() {
-	EVENTD_TESTS_TMP_DIR="${T}" meson_src_test
+	# Drop LC_NUMERIC=C on next verbump.
+	# https://github.com/sardemff7/eventd/issues/39
+	LC_NUMERIC=C EVENTD_TESTS_TMP_DIR="${T}" meson_src_test
 }
 
 pkg_postinst() {
diff --git a/net-misc/memcached/memcached-1.4.39.ebuild b/net-misc/memcached/memcached-1.4.39.ebuild
index 8f0462455dad..a9ce2f91be30 100644
--- a/net-misc/memcached/memcached-1.4.39.ebuild
+++ b/net-misc/memcached/memcached-1.4.39.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.2.ebuild b/net-misc/memcached/memcached-1.5.2.ebuild
index 28a5a31765f6..c3a62d5ae798 100644
--- a/net-misc/memcached/memcached-1.5.2.ebuild
+++ b/net-misc/memcached/memcached-1.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.6.ebuild b/net-misc/memcached/memcached-1.5.6.ebuild
index 7b92758285f1..08c1e0d3499a 100644
--- a/net-misc/memcached/memcached-1.5.6.ebuild
+++ b/net-misc/memcached/memcached-1.5.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml
index 1d5d87bb77ec..1b672f18d768 100644
--- a/net-misc/miniupnpd/metadata.xml
+++ b/net-misc/miniupnpd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
diff --git a/net-misc/ntp/ntp-4.2.8_p11.ebuild b/net-misc/ntp/ntp-4.2.8_p11.ebuild
index 179de05fc600..0f9e974c6ad5 100644
--- a/net-misc/ntp/ntp-4.2.8_p11.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p11.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 ~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 ~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/nx/nx-3.5.99.15.ebuild b/net-misc/nx/nx-3.5.99.15.ebuild
index bbb4663dc606..75aa788486f6 100644
--- a/net-misc/nx/nx-3.5.99.15.ebuild
+++ b/net-misc/nx/nx-3.5.99.15.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 	# have quilt installed.
 	sed 's@which quilt@false@' -i mesa-quilt || die
 
-	# run autoreconf in all neeed folders
+	# run autoreconf in all needed folders
 	for i in nxcomp nx-X11/lib nxcompshad nxproxy ; do
 		pushd ${i} || die
 		eautoreconf
@@ -57,11 +57,15 @@ src_prepare() {
 }
 
 src_configure() {
-	for i in nxcomp nx-X11/lib nxcompshad nxproxy ; do
+	for i in nxcomp nxcompshad nxproxy ; do
 		pushd ${i} || die
 		econf
 		popd || die
 	done
+
+	pushd "nx-X11/lib" || die
+	econf --disable-poll
+	popd || die
 }
 
 src_compile() {
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index e1e0dbe4f79b..299ae83a14cf 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -3,11 +3,8 @@ DIST openssh-7.5p1+x509-10.2.diff.gz 467040 BLAKE2B 4048b0f016bf7d43276f88117fc2
 DIST openssh-7.5p1-hpnssh14v12.tar.xz 23068 BLAKE2B 15702338877e50c2143b33b93bfc87d0aa0fa55915db1f0cab9c22e55f8aa0c6eeb5a56f438d849544d1650bdc574384b851292d621b79f673b78bc37617aa0b SHA512 45c42090a212b9ce898fbaa8284ddf0f0d17236af13c4a780e00bf265b0c7a4286027e90a7ce9ad70066309db722709dd2f0a7914f57e5364ffbaf7c4859cdf9
 DIST openssh-7.5p1.tar.gz 1510857 BLAKE2B 505764a210018136456c0f5dd40ad9f1383551c3ae037593d4296305df189e0a6f1383adc89b1970d58b8dcfff391878b7a29b848cc244a99705a164bec5d734 SHA512 58c542e8a110fb4316a68db94abb663fa1c810becd0638d45281df8aeca62c1f705090437a80e788e6c29121769b72a505feced537d3118c933fde01b5285c81
 DIST openssh-7.6_p1-sctp.patch.xz 6996 BLAKE2B 4a857afdc8fa5cb2bfb9dd1805ac6343e774ac7423e2f4439f2adf585aae18fcf55d63f7f5421e716d76e2dd0205b186b6fea1f53132453ea82f0821cea3124c SHA512 8445a9a8ae8e8baa67c8f386117877ba3f39f33c9cdaff341c8d5fb4ce9dfe22f26d5aedc2b0d4aab67864994ec5a6a487d18b728bd5d5c6efe14175eb9c8151
-DIST openssh-7.6p1+x509-11.0.diff.gz 440219 BLAKE2B 9329a7cf8575c21c31ec73f8ca1084708de34a5b530699d8be2a2a75e1ce0d37210a897c894ab75ee8e2ad0f0802d483d041b1bf3cf3ea46a4a423f1350f42d2 SHA512 add86ecdaa696d997f869e6878aaaef285590cc5eddf301be651944bbc6c80af6a891bad6f6aaa4b6e9919ad865a27dc6f45a6e0b923ca52c04f06523fa3197a
-DIST openssh-7.6p1+x509-11.1.diff.gz 451725 BLAKE2B 1397c05539ce7532f5e6bf33fc16d5661c32365e127ab1134c0a12c70f0645b05eb05d3ebd9bf64ed59cb94a63cbe8466ac87c9831605230d1ccd578a736904b SHA512 8d445911d8b28fb922a2a0ddb4b7783f81bc258af708148541d30cb79012789cc319bc2031b4584c4c5504480b70077e675be01070fd3065dc4f5ddee89ad8f1
 DIST openssh-7.6p1+x509-11.2.diff.gz 466657 BLAKE2B 3f4f108e2d97eb292c215bc3a6e2c64ae6b9e49704f46f46a21496a71d5ebd051ab648446bf71ef141e2114f4a03363d8cd043f5813f957c2c5f2e2eb193931d SHA512 1c0fea91037bfcaed7aa3f0cb01d262410a99d3e1b98a25a012db5d683f3275ab52f78f1e446bd7e543c78f9d406b1dce2bb3997214534ae94e11c254658080f
 DIST openssh-7.6p1-hpnssh14v12-r1.tar.xz 15440 BLAKE2B e140852a3ce63e4f744ed4b18b474cf88d09ca55509e5a16d26eef5cf8574466b472073eef56e19467932959d9ba7e941ab561d9ea0704dfee3fd08a6ba7ba8c SHA512 9d0450ec99fe550d790e471cb7815d0863788cf9c41dfef653d102f02be3d38a09e5103e537658279216a5815c1a075ded9f011e05ce216beee2c7daeea8c75a
-DIST openssh-7.6p1-hpnssh14v12.tar.xz 15392 BLAKE2B 6888ea4054a470116b2ab3d115f54e3ee54e0d05a24d3331613c241e684a43354b6100ee2be76e5b2dcc8f0444fbae5d146830d634e53a85124d5e553759a552 SHA512 0e2c62cdec360090b359edfd5bbe894fb25d22e387677e8a5d6cf6a0807b0572fda30b90c30390d5b68e359e9958cb1c65abae4afd9af5892c3f64f6f8001956
 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch
deleted file mode 100644
index d55656aae974..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/openssh-7.6p1-hpnssh14v12/0004-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:02:11.850912525 -0700
-+++ b/openssh-7.6p1-hpnssh14v12/0004-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:35:06.223424844 -0700
-@@ -907,9 +907,9 @@
- @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1)
-  {
-  	/* Send our own protocol version identification. */
-- 	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);
-  	if (atomicio(vwrite, connection_out, client_version_string,
-  	    strlen(client_version_string)) != strlen(client_version_string))
-  		fatal("write: %.100s", strerror(errno));
-@@ -918,11 +918,11 @@
- --- a/sshd.c
- +++ b/sshd.c
- @@ -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\r\n",
-+-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment,
-++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment,
-  	    *options.version_addendum == '\0' ? "" : " ",
-  	    options.version_addendum);
-  
-@@ -982,13 +982,14 @@
- index e093f623..83f0932d 100644
- --- a/version.h
- +++ b/version.h
--@@ -3,4 +3,5 @@
-+@@ -3,3 +3,6 @@
-  #define SSH_VERSION	"OpenSSH_7.6"
-  
-- #define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
-+-#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
-++#define SSH_PORTABLE	"p1"
- +#define SSH_HPN		"-hpn14v12"
-++#define SSH_X509		"-PKIXSSH-11.0"
--+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
-++#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN
- -- 
- 2.14.2
- 
diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch
deleted file mode 100644
index 2ed6a7b54a66..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:02:11.850912525 -0700
-+++ b/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:35:06.223424844 -0700
-@@ -907,9 +907,9 @@
- @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1)
-  {
-  	/* Send our own protocol version identification. */
-- 	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);
-  	if (atomicio(vwrite, connection_out, client_version_string,
-  	    strlen(client_version_string)) != strlen(client_version_string))
-  		fatal("write: %.100s", strerror(errno));
-@@ -918,11 +918,11 @@
- --- a/sshd.c
- +++ b/sshd.c
- @@ -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\r\n",
-+-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment,
-++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment,
-  	    *options.version_addendum == '\0' ? "" : " ",
-  	    options.version_addendum);
-  
-@@ -982,13 +982,14 @@
- index e093f623..83f0932d 100644
- --- a/version.h
- +++ b/version.h
--@@ -3,4 +3,5 @@
-+@@ -3,3 +3,6 @@
-  #define SSH_VERSION	"OpenSSH_7.6"
-  
-- #define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
-+-#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
-++#define SSH_PORTABLE	"p1"
- +#define SSH_HPN		"-hpn14v12"
-++#define SSH_X509		"-PKIXSSH-11.0"
--+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
-++#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN
- -- 
- 2.14.2
- 
diff --git a/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch
new file mode 100644
index 000000000000..9d8f9a6cdef3
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch
@@ -0,0 +1,44 @@
+--- a/openssh-7.6p1+x509-11.2.diff	2018-03-13 10:48:08.755434051 -0700
++++ b/openssh-7.6p1+x509-11.2.diff	2018-03-13 10:51:27.217980071 -0700
+@@ -29025,13 +29025,6 @@
+ diff -ruN openssh-7.6p1/servconf.c openssh-7.6p1+x509-11.2/servconf.c
+ --- openssh-7.6p1/servconf.c	2017-10-02 22:34:26.000000000 +0300
+ +++ openssh-7.6p1+x509-11.2/servconf.c	2018-02-11 12:07:01.000000000 +0200
+-@@ -1,5 +1,5 @@
+- 
+--/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */
+-+/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */
+- /*
+-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+-  *                    All rights reserved
+ @@ -9,6 +9,29 @@
+   * software must be clearly marked as such, and if the derived work is
+   * incompatible with the protocol description in the RFC file, it must be
+@@ -29467,27 +29460,6 @@
+  	case sAllowUsers:
+  		while ((arg = strdelim(&cp)) && *arg != '\0') {
+  			if (options->num_allow_users >= MAX_ALLOW_USERS)
+-@@ -1663,9 +1931,9 @@
+- 		if (!arg || *arg == '\0')
+- 			fatal("%s line %d: missing PermitOpen specification",
+- 			    filename, linenum);
+--		i = options->num_permitted_opens;	/* modified later */
+-+		value = options->num_permitted_opens;	/* modified later */
+- 		if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
+--			if (*activep && i == 0) {
+-+			if (*activep && value == 0) {
+- 				options->num_permitted_opens = 1;
+- 				options->permitted_opens = xcalloc(1,
+- 				    sizeof(*options->permitted_opens));
+-@@ -1683,7 +1951,7 @@
+- 			if (arg == NULL || ((port = permitopen_port(arg)) < 0))
+- 				fatal("%s line %d: bad port number in "
+- 				    "PermitOpen", filename, linenum);
+--			if (*activep && i == 0) {
+-+			if (*activep && value == 0) {
+- 				options->permitted_opens = xrecallocarray(
+- 				    options->permitted_opens,
+- 				    options->num_permitted_opens,
+ @@ -1885,11 +2153,20 @@
+  
+  	case sDeprecated:
diff --git a/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch b/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch
new file mode 100644
index 000000000000..5dc96d4d0a37
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch
@@ -0,0 +1,49 @@
+From 69bda0228861f3dacd4fb3d28b60ce9d103d254b Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <djm@openbsd.org>
+Date: Wed, 4 Oct 2017 18:49:30 +0000
+Subject: [PATCH] upstream commit
+
+fix (another) problem in PermitOpen introduced during the
+channels.c refactor: the third and subsequent arguments to PermitOpen were
+being silently ignored; ok markus@
+
+Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd
+---
+ servconf.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/servconf.c b/servconf.c
+index 2c321a4a..95686295 100644
+--- a/servconf.c
++++ b/servconf.c
+@@ -1,5 +1,5 @@
+ 
+-/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */
++/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */
+ /*
+  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+  *                    All rights reserved
+@@ -1663,9 +1663,9 @@ process_server_config_line(ServerOptions *options, char *line,
+ 		if (!arg || *arg == '\0')
+ 			fatal("%s line %d: missing PermitOpen specification",
+ 			    filename, linenum);
+-		i = options->num_permitted_opens;	/* modified later */
++		value = options->num_permitted_opens;	/* modified later */
+ 		if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
+-			if (*activep && i == 0) {
++			if (*activep && value == 0) {
+ 				options->num_permitted_opens = 1;
+ 				options->permitted_opens = xcalloc(1,
+ 				    sizeof(*options->permitted_opens));
+@@ -1683,7 +1683,7 @@ process_server_config_line(ServerOptions *options, char *line,
+ 			if (arg == NULL || ((port = permitopen_port(arg)) < 0))
+ 				fatal("%s line %d: bad port number in "
+ 				    "PermitOpen", filename, linenum);
+-			if (*activep && i == 0) {
++			if (*activep && value == 0) {
+ 				options->permitted_opens = xrecallocarray(
+ 				    options->permitted_opens,
+ 				    options->num_permitted_opens,
+-- 
+2.16.1
+
diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch b/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch
deleted file mode 100644
index b84ee64e4f7c..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openssh-7.6p1+x509-11.0.diff	2017-11-06 17:16:28.334140140 -0800
-+++ b/openssh-7.6p1+x509-11.0.diff	2017-11-06 17:16:55.338223563 -0800
-@@ -54732,7 +54732,7 @@
- +int/*bool*/ ssh_x509store_addlocations(const X509StoreOptions *locations);
- +
- +typedef char SSHXSTOREPATH;
--+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- +DECLARE_STACK_OF(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_new_null()	SKM_sk_new_null(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_num(st)	SKM_sk_num(SSHXSTOREPATH, (st))
diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch b/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch
deleted file mode 100644
index c3b6b4d61a3e..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openssh-7.6p1+x509-11.1.diff	2017-11-06 17:16:28.334140140 -0800
-+++ b/openssh-7.6p1+x509-11.1.diff	2017-11-06 17:16:55.338223563 -0800
-@@ -54732,7 +54732,7 @@
- +int/*bool*/ ssh_x509store_addlocations(const X509StoreOptions *locations);
- +
- +typedef char SSHXSTOREPATH;
--+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- +DECLARE_STACK_OF(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_new_null()	SKM_sk_new_null(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_num(st)	SKM_sk_num(SSHXSTOREPATH, (st))
diff --git a/net-misc/openssh/openssh-7.6_p1-r2.ebuild b/net-misc/openssh/openssh-7.6_p1-r2.ebuild
deleted file mode 100644
index ce99373986b0..000000000000
--- a/net-misc/openssh/openssh-7.6_p1-r2.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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.6_p1-sctp.patch.xz"
-LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
-X509_VER="11.0" 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:+https://dev.gentoo.org/~polynomial-c/${SCTP_PATCH}}
-	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${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 ~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 +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	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
-
-	eapply "${FILESDIR}/${P}-warnings.patch"
-
-	# 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}" >/dev/null
-			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			eapply "${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch
-			popd >/dev/null
-		fi
-		save_version X509
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-	fi
-
-	if use ldap ; then
-		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
-		save_version LPK
-	fi
-
-	eapply "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	use X509 || eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-	use abi_mips_n32 && eapply "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
-	if use hpn ; then
-		elog "Applying HPN patchset ..."
-		eapply "${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
-
-	eapply_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 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}-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 has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
-		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-	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
-
-	# remove this if aes-ctr-mt gets fixed
-	if use hpn; then
-		elog "The multithreaded AES-CTR cipher has been temporarily dropped from the HPN patch"
-		elog "set since it does not (yet) work with >=openssh-7.6p1."
-	fi
-}
diff --git a/net-misc/openssh/openssh-7.6_p1-r3.ebuild b/net-misc/openssh/openssh-7.6_p1-r5.ebuild
similarity index 97%
rename from net-misc/openssh/openssh-7.6_p1-r3.ebuild
rename to net-misc/openssh/openssh-7.6_p1-r5.ebuild
index 131e6e1da0d8..46f1d676f5f3 100644
--- a/net-misc/openssh/openssh-7.6_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.6_p1-r5.ebuild
@@ -12,7 +12,7 @@ PARCH=${P/_}
 HPN_PATCH="${PARCH}-hpnssh14v12-r1.tar.xz"
 SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz"
 LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
-X509_VER="11.1" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+X509_VER="11.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.org/"
@@ -110,6 +110,7 @@ src_prepare() {
 	cp version.h version.h.pristine
 
 	eapply "${FILESDIR}/${P}-warnings.patch"
+	eapply "${FILESDIR}/${P}-permitopen.patch"
 
 	# don't break .ssh/authorized_keys2 for fun
 	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
@@ -118,10 +119,14 @@ src_prepare() {
 		if use hpn ; then
 			pushd "${WORKDIR}" >/dev/null
 			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			eapply "${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch
 			popd >/dev/null
 			save_version X509
 		fi
+		# remove this with the next version bump
+		pushd "${WORKDIR}" >/dev/null
+		eapply "${FILESDIR}/${P}-permitopen-x509-glue.patch"
+		popd >/dev/null
+
 		eapply "${WORKDIR}"/${X509_PATCH%.*}
 	fi
 
diff --git a/net-misc/openssh/openssh-7.6_p1.ebuild b/net-misc/openssh/openssh-7.6_p1.ebuild
deleted file mode 100644
index ff5b2fc3ad58..000000000000
--- a/net-misc/openssh/openssh-7.6_p1.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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.6_p1-sctp.patch.xz"
-LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
-X509_VER="11.0" 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:+https://dev.gentoo.org/~polynomial-c/${SCTP_PATCH}}
-	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${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 ~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 +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	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
-
-	eapply "${FILESDIR}/${P}-warnings.patch"
-
-	# 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}" >/dev/null
-			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			eapply "${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch
-			popd >/dev/null
-		fi
-		save_version X509
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-	fi
-
-	if use ldap ; then
-		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
-		save_version LPK
-	fi
-
-	eapply "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	use X509 || eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-	use abi_mips_n32 && eapply "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
-	if use hpn ; then
-		elog "Applying HPN patchset ..."
-		eapply "${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
-
-	eapply_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 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}-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 has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
-		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-	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
-
-	# remove this if aes-ctr-mt gets fixed
-	if use hpn; then
-		elog "The multithreaded AES-CTR cipher has been temporarily dropped from the HPN patch"
-		elog "set since it does not (yet) work with >=openssh-7.6p1."
-	fi
-}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index bfdb1d470b36..e795f529d989 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,2 +1,3 @@
 DIST owncloudclient-2.3.4.tar.xz 33796736 BLAKE2B 3792be4f534c3424a58e83bfacef30a20d089df55de79dbaa51cfc9d20e7558ab65b65bda4ebf691276de050436253ffdb69dcdf7bad397c3dd4a074124e3053 SHA512 2a66182c1f679f4bb6d13c8b21d280dd6b530b8ef82e71a4fa0fecfed9a3f1a55f181ae3d96b24ff040a6f3c0b12777df035ee951264186ad3409e66da05b87b
 DIST owncloudclient-2.4.0.tar.xz 15385568 BLAKE2B 616c4d5ca58a5c7fb4900a7b46df81a13f477c623e590e74be3b14fae2bf51f3f00154707aebb22fe839cba896c41caa6c71aa9d0f481bb8cf2b2b79dc648060 SHA512 b2e8bcc12e4f087d868244e1e453d7d81ab076dfe8b14965d37ef9e4cb05f2237254edd2c261a28bd5ddd9534bd80f0491d476844f4f0a5a69dd42ec52f450f0
+DIST owncloudclient-2.4.1.tar.xz 15403164 BLAKE2B 0ab1ffbe2179fe04efc7977972d5941a32bc20cd73e310fa72e2a3cf341f7223911fd430f4d34f7e265819acb68d8576e2687a7bfe4ab7140b4c9e9381ea863b SHA512 5b0ceea299078efbc92c1abe22210a93df44bf98094bf4cf8a0c5138f0b69a6719fdc88ef2d5674d49c0ec18ffb12493319eb84616c3e4b8666171cb1a52f0b7
diff --git a/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild
new file mode 100644
index 000000000000..d35a8f1964b6
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
index ca94cc47d3fe..1a7cd51e4ff5 100644
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} = *_pre* ]] || \
-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="acl examples iconv ipv6 static stunnel xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
diff --git a/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild
index 53df37c70e2c..ae8b67cda78e 100644
--- a/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild
@@ -20,7 +20,7 @@ COMMON_DEPEND="dev-qt/qtcore:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	>=net-libs/libssh-0.6.0_rc1
+	>=net-libs/libssh-0.7.5-r2
 	net-print/cups
 	x11-libs/libXpm
 	ldap? ( net-nds/openldap )"
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
index 6f481fc8cff5..3aeb90b0e70f 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
@@ -15,12 +15,13 @@ IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-DEPEND=""
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/Config-Simple
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	dev-perl/File-Which
+	dev-perl/Try-Tiny
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.0.25
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
index 7c027d7422ae..b875b6ca9daa 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
@@ -15,12 +15,13 @@ IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-DEPEND=""
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/Config-Simple
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	dev-perl/File-Which
+	dev-perl/Try-Tiny
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.0.25
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.0-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.0-r1.ebuild
index 4604560af49d..36e6bdd7c3dd 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.0-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.0-r1.ebuild
@@ -15,13 +15,14 @@ IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-DEPEND=""
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/Config-Simple
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	dev-perl/File-Which
 	dev-perl/Switch
+	dev-perl/Try-Tiny
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.99.14
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
index 5f3be4028956..c281ef09ff5a 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
@@ -15,13 +15,14 @@ IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-DEPEND=""
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/Config-Simple
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	dev-perl/File-Which
 	dev-perl/Switch
+	dev-perl/Try-Tiny
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.0.25
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 1f07de60209d..0f93977e15c4 100644
Binary files a/net-nds/Manifest.gz and b/net-nds/Manifest.gz differ
diff --git a/net-nds/rpcbind/rpcbind-0.2.4-r2.ebuild b/net-nds/rpcbind/rpcbind-0.2.4-r3.ebuild
similarity index 97%
rename from net-nds/rpcbind/rpcbind-0.2.4-r2.ebuild
rename to net-nds/rpcbind/rpcbind-0.2.4-r3.ebuild
index aa7c610e94f5..8431b518c940 100644
--- a/net-nds/rpcbind/rpcbind-0.2.4-r2.ebuild
+++ b/net-nds/rpcbind/rpcbind-0.2.4-r3.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
 LICENSE="BSD"
 SLOT="0"
 IUSE="debug selinux systemd tcpd warmstarts"
+REQUIRED_USE="systemd? ( warmstarts )"
 
 CDEPEND=">=net-libs/libtirpc-1.0:=
 	systemd? ( sys-apps/systemd:= )
diff --git a/net-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-9999.ebuild
index bd9f7853dc4e..3a5262860d77 100644
--- a/net-nds/rpcbind/rpcbind-9999.ebuild
+++ b/net-nds/rpcbind/rpcbind-9999.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
 LICENSE="BSD"
 SLOT="0"
 IUSE="debug selinux systemd tcpd warmstarts"
+REQUIRED_USE="systemd? ( warmstarts )"
 
 CDEPEND=">=net-libs/libtirpc-0.2.3:=
 	systemd? ( sys-apps/systemd:= )
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 984abe10cfd3..bbe3d883500c 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index 77f58934f397..c81c8b0942fa 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -82,7 +82,6 @@ src_configure() {
 		-DENABLE_NLS=$(usex nls ON OFF)
 		-DENABLE_QT=$(usex qt5 ON OFF)
 		-DENABLE_TESTS=$(usex test ON OFF)
-		-DUSE_QT5=ON
 
 		-DUSE_SYSTEM_EVENT2=ON
 		-DUSE_SYSTEM_DHT=OFF
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index b30a8cac7c96..f2d71eda344d 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups-filters/cups-filters-1.17.9.ebuild b/net-print/cups-filters/cups-filters-1.17.9.ebuild
index 3a6a5e253b38..2fbdff771bdc 100644
--- a/net-print/cups-filters/cups-filters-1.17.9.ebuild
+++ b/net-print/cups-filters/cups-filters-1.17.9.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 filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 6be77e87fc61..89694da859f4 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
index 72eecce94d3b..0e0b41e2fb4a 100644
--- a/net-vpn/strongswan/metadata.xml
+++ b/net-vpn/strongswan/metadata.xml
@@ -5,10 +5,6 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<longdescription lang="en">
 		StrongSwan is direct descendant of the discontinued FreeS/WAN project.
 		As an IPsec based VPN solution which is focused on security and ease of
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 40063aabda65..6888e9a2a6b3 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index b297fe04091b..c9e64330eaf5 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,2 +1,3 @@
 DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02dac122a57bd44c41a1aeeb21b4c1476cab2ce89a7d3570fc1b592f1a2ed9e1f96c289faee942d203d1e3aa85 SHA512 86fa1baae1593d4824038db8418358b0be624c81fc23ee8f96ec08979d309a2377be3924ab53cc0fcb712aec8e696360e9a9f4de4c12cc31b14de5cf495a11a6
 DIST bluez-5.48.tar.xz 1733952 BLAKE2B 0a68a1b790d752b02b8ab3d0eeaa9387c15851003a1d691cb476cef564c032498935997b84af4dd8bdb448dbe434eedecb982a9a867dd4dfa2ca0c8a23f371c3 SHA512 38cb20b8acee8adaab286a0b042efa770df367e7a69556117961fcc46d9e0a0e2a48059c7df9511bb00fe7fc37e916e34c928df9372b45051fcc57c8965b0bb7
+DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
diff --git a/net-wireless/bluez/bluez-5.49.ebuild b/net-wireless/bluez/bluez-5.49.ebuild
new file mode 100644
index 000000000000..921e17a3ae89
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.49.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+	extra-tools? ( deprecated readline )
+	test? ( ${PYTHON_REQUIRED_USE} )
+	test-programs? ( ${PYTHON_REQUIRED_USE} )
+	user-session? ( systemd )
+"
+
+CDEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.6:=[user-session=]
+	>=sys-apps/hwids-20121202.2
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups:= )
+	mesh? (
+		dev-libs/json-c:=
+		sys-libs/readline:0= )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? ( sys-apps/systemd )
+	udev? ( >=virtual/udev-172 )
+"
+TEST_DEPS="${PYTHON_DEPS}
+	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? (	${TEST_DEPS} )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+DOC_CONTENTS="
+	If you want to control your bluetooth devices as a non-root user,
+	please remember to add you to plugdev group.
+"
+
+PATCHES=(
+	# Use static group "plugdev" to not force people to become root for
+	# controlling the devices.
+	"${FILESDIR}"/bluez-plugdev.patch
+
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	"${FILESDIR}"/bluez-udevadm-path.patch
+
+	# build: Quote systemd variable names, bug #527432
+	# http://article.gmane.org/gmane.linux.bluez.kernel/67230
+	"${FILESDIR}"/bluez-5.39-systemd-quote.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# ???
+	"${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
+)
+
+pkg_setup() {
+	enewgroup plugdev
+
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		# --enable-mesh is handled in the same way
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	# btpclient disabled because we don't have ell library in the tree
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--disable-btpclient \
+		--enable-datafiles \
+		--enable-experimental \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(multilib_native_use_enable alsa midi) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Only install extra-tools when relevant USE flag is enabled
+		if use extra-tools; then
+			ewarn "Upstream doesn't support using this tools and their bugs are"
+			ewarn "likely to be ignored forever, also that tools can break"
+			ewarn "without previous announcement."
+			ewarn "Upstream also states all this tools are not really needed,"
+			ewarn "then, if you still need to rely on them, you must ask them"
+			ewarn "to either install that tool by default or add the needed"
+			ewarn "functionality to the existing 'official' tools."
+			ewarn "Please report this issues to:"
+			ewarn "http://www.bluez.org/development/lists/"
+
+			# Upstream doesn't install this, bug #524640
+			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			# gatttool is only built with readline, bug #530776
+			dobin attrib/gatttool
+			dobin tools/btmgmt
+		fi
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# example-gatt-client is the only one needing
+			# python3, the others are python2 only. Remove
+			# until we see how to pull in python2 and python3
+			# for runtime
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-includeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	# We need to ensure obexd can be spawned automatically by systemd
+	# when user-session is enabled:
+	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+	# https://bugs.gentoo.org/show_bug.cgi?id=577842
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+	# https://bugs.archlinux.org/task/45816
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+	use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+
+	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network; do
+		doins profiles/${d}/${d}.conf
+	done
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	! use systemd && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	! use systemd && readme.gentoo_print_elog
+
+	use udev && udev_reload
+	systemd_reenable bluetooth.service
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
+}
diff --git a/net-wireless/crda/metadata.xml b/net-wireless/crda/metadata.xml
index 147730ec61a6..f89b1f51283d 100644
--- a/net-wireless/crda/metadata.xml
+++ b/net-wireless/crda/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 780abeddef35..109bc255a2da 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<longdescription>
 		User space daemon for the hostap-driver.
 		Extended IEEE 802.11 management, IEEE 802.1X Authenticator,
diff --git a/net-wireless/iw/metadata.xml b/net-wireless/iw/metadata.xml
index 7639c4605505..2b9b4266ca5b 100644
--- a/net-wireless/iw/metadata.xml
+++ b/net-wireless/iw/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index 807ccfc0e035..77a7bbd4d699 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a3d66c75d833..2b859ce3b164 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index b5cf9e6c62ca..de9bb726ea74 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (11 Mar 2018)
+# Testing requires having libc++ built against libc++abi right now
+# (and we force linking to libcxxrt).
+sys-libs/libcxxabi test
+
 # Michał Górny <mgorny@gentoo.org> (02 Mar 2018)
 # Someone needs to test the driver.
 x11-base/xorg-drivers video_cards_amdgpu
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index c304dcf8237c..29c4e3c459ff 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (12 Mar 2018)
+# Requires masked net-misc/curl with libressl.
+dev-libs/libgit2 libressl
+
 # Michał Górny <mgorny@gentoo.org> (03 Mar 2018)
 # Requires masked dependent flags.
 net-fs/samba ads
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 8761fea48606..31362741dc8e 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Mar 2018)
+# missing keyword on media-libs/portmidi
+media-sound/hydrogen portmidi
+
 # Gilles Dartiguelongue <eva@gentoo.org> (16 Aug 2017)
 # missing keyword on dev-python/dbusmock, bug #620024
 >=gnome-base/gnome-settings-daemon-3.24 test
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 73d04afca336..6ac1e78c24a2 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# libewf is going to be removed, bug #547418
+app-admin/testdisk ewf
+app-forensics/sleuthkit ewf
+
 # Patrick McLean <chutzpah@gentoo.org> (6 Mar 2018)
 # Requires dev-libs/boost-1.66 that is unkeyworded/masked
 >=sys-cluster/ceph-12.2.4 system-boost
diff --git a/profiles/default/linux/amd64/17.0/musl/hardened/selinux/eapi b/profiles/default/linux/amd64/17.0/musl/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/musl/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/musl/hardened/selinux/parent b/profiles/default/linux/amd64/17.0/musl/hardened/selinux/parent
new file mode 100644
index 000000000000..23c64bb44399
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/musl/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/17.0/musl/selinux/eapi b/profiles/default/linux/x86/17.0/musl/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/musl/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/musl/selinux/parent b/profiles/default/linux/x86/17.0/musl/selinux/parent
new file mode 100644
index 000000000000..2190e9797eaa
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/musl/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/profiles/license_groups b/profiles/license_groups
index ee18a412c5fc..4e85847f2ace 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant Xerox yangcli-pro zi-labone
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant yangcli-pro zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index a48ece193695..d39db1155481 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,86 @@
 
 #--- END OF EXAMPLES ---
 
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Tests need network, nothing requires this old lib anymore and upstream is
+# dead for a long time (#335233). Removal in a month.
+net-libs/netembryo
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Fails to build (#371401, #642676). Removal in a month.
+net-misc/netkit-rwall
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Incomplete and unclear LICENSE, missing files in SRC_URI (#472602).
+# Removal in a month.
+sci-electronics/balsa
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Upstream dead for a long time, requires obsolete gstreamer and other old
+# libs (#629192), buggy (#490344). Removal in a month.
+media-tv/me-tv
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Doesn't build for a long time (#514432). Removal in a month.
+sci-biology/beast-mcmc
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Fails to build (#514632, #585606, #588710). Removal in a month.
+sys-power/phc-k8
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Fails to build for a long time (#515734, 649840). Removal in a month.
+sys-fs/gfs2-utils
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Dead driver and with many incompatibilities with current kernels (#517250,
+# #523356, #551834, #646106). Removal in a month. Possible alternative
+# #device/driver: https://bugs.gentoo.org/517250#c5
+net-wireless/broadcom-sta 
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Not buildable for a long time (#531586), pending many version bumps.
+# Removal in a month.
+media-sound/mup
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Many other ident daemons in the tree over this completely dead and
+# unmaintained (since 2003) implementation (#535868). Removal in a month.
+net-misc/linux-identd
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Major version bump pending (#540322), current version in the tree is
+# completely broken in several ways (#471428, #598260, #621784, #638364).
+# Removal in a month.
+sys-cluster/gearmand
+dev-php/pecl-gearman
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Not buildable and ends up needing old guile-1.8 (#547186, #617802), major
+# version bump pending (#515888). Removal in a month.
+media-sound/denemo
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Hard to bump (#547418), build issues (#600308). Removal in a month.
+app-forensics/libewf
+app-forensics/rdd
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Many pending version bumps (#574874), doesn't run (#587112), doesn't use
+# python eclasses (#613892), needs obsolete libs (#640888). Removal in a
+# month.
+net-p2p/tribler
+
+# Tobias Klausmann <klausman@gentoo.org (13 Mar 2018)
+# Has a bug in the storage engine, details:
+# https://www.robustperception.io/new-features-in-prometheus-2-2-0/
+# https://github.com/prometheus/prometheus/issues/3943
+=net-analyzer/prometheus-2.2.0
+
+# Sebastian Pipping <sping@gentoo.org> (11 Mar 2018)
+# Breaks XFCE, 1.19.6 was fine (in that regard). Bug #650228
+>=x11-base/xorg-server-1.19.7
+
 # Andreas Sturmlechner <asturm@gentoo.org> (11 Mar 2018)
 # Dead upstream, no revdeps left. Bug #639358
 app-i18n/libguess
@@ -62,11 +142,6 @@ media-gfx/qosmic
 # Bug 649764 Removal in 30 days.
 dev-db/maxscale
 
-# Lars Wendler <polynomial-c@gentoo.org> (06 Mar 2018)
-# Masked as it breaks x2go
-=net-misc/nx-3.5.99.15
-=net-misc/x2goserver-4.1.0.0-r1
-
 # Andreas Sturmlechner <asturm@gentoo.org> (06 Mar 2018)
 # Maintainer not responding, depends on deprecated Qt4.
 # Masked for removal in 30 days. Bug 598651, 635192, 644396
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 7ae807fe36b4..a1a9e1947726 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -288,6 +288,7 @@ amd64		default/linux/musl/amd64/x32				exp
 amd64		hardened/linux/musl/amd64/x32				exp
 amd64		default/linux/amd64/17.0/musl				exp
 amd64		default/linux/amd64/17.0/musl/hardened			exp
+amd64		default/linux/amd64/17.0/musl/hardened/selinux		exp
 arm		default/linux/musl/arm/armv7a				exp
 arm		hardened/linux/musl/arm/armv7a				exp
 arm		default/linux/arm/17.0/musl/armv7a			exp
@@ -303,6 +304,7 @@ ppc		hardened/linux/musl/ppc					exp
 x86		default/linux/musl/x86					exp
 x86		hardened/linux/musl/x86					exp
 x86		default/linux/x86/17.0/musl				exp
+x86		default/linux/x86/17.0/musl/selinux			exp
 
 # Non-embedded uclibc profiles
 # @MAINTAINER: uclibc@gentoo.org
diff --git a/profiles/targets/systemd/package.use b/profiles/targets/systemd/package.use
new file mode 100644
index 000000000000..d0552f6cb8ba
--- /dev/null
+++ b/profiles/targets/systemd/package.use
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Mike Gilbert <floppym@gentoo.org> (12 Mar 2018)
+# Satisfy REQUIRED_USE by default, bug 650030.
+net-nds/rpcbind warmstarts
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index e9c7d94a5d8b..75247fddf3a7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2108,6 +2108,7 @@ dev-libs/libffi:pax_kernel - Use PaX emulated trampolines, for we can't use PROT
 dev-libs/libflatarray:cuda - Enables plugins for NVIDIA GPUs (e.g. CUDAAllocator)
 dev-libs/libgcrypt:o-flag-munging - Enable O-flag mangling during build
 dev-libs/libgdata:gnome-online-accounts - Enable net-libs/gnome-online-accounts support
+dev-libs/libgit2:curl - Use net-misc/curl for HTTP support (otherwise, limited built-in implementation will be used)
 dev-libs/libgit2:gssapi - Enable GSSAPI support for SPNEGO auth
 dev-libs/libgit2:ssh - Enable SSH transport support
 dev-libs/libgit2:trace - Enable tracing support
@@ -4347,6 +4348,7 @@ media-libs/svgalib:kernel-helper - Build the helper kernel module
 media-libs/taglib:boost - Use dev-libs/boost instead of GCC built-ins
 media-libs/tremor:low-accuracy - enable 32bit only multiply operations
 media-libs/vigra:valgrind - Enable valgrind in make check
+media-libs/vulkan-loader:demos - Build vulkan demos and vulkaninfo
 media-libs/waffle:egl - Enable EGL support
 media-libs/waffle:gbm - Enable support for the Generic Buffer Manager (gbm)
 media-libs/waffle:wayland - Enable Wayland support
@@ -7752,7 +7754,7 @@ sys-apps/s390-tools:ncurses - build hyptop monitoring program
 sys-apps/s390-tools:pfm - build the cpacfstats tool
 sys-apps/s390-tools:zfcpdump - build the kernel disk dumping utility
 sys-apps/s390-tools:zlib - build the zgetdump utility
-sys-apps/sed:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)
+sys-apps/sed:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands). Note: This may break many configure scripts, so it should be avoided on dev systems (and generally used on binpkg/final systems only).
 sys-apps/selinux-python:audit - Enable support for sys-process/audit and use the audit_* functions (like audit_getuid instead of getuid())
 sys-apps/smartmontools:caps - Build against sys-libs/libcap-ng to allow smartd to drop its privileges.
 sys-apps/smartmontools:daemon - Install the monitoring daemon (smartd) and associated scripts.
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index d3e2e55bcd81..c69ead06b946 100644
Binary files a/sci-biology/Manifest.gz and b/sci-biology/Manifest.gz differ
diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest
index 1925b3f4b3e8..e27e133eac6e 100644
--- a/sci-biology/rebase/Manifest
+++ b/sci-biology/rebase/Manifest
@@ -2,3 +2,4 @@ DIST rebase-1701.tar.xz 120604368 BLAKE2B 1160f494b4e8650fb8ab9144756642377322a2
 DIST rebase-1702.tar.xz 117583312 BLAKE2B 19089d5767c35da22fb95bac7bc030ef593b159dda04d512b053a84c1cb4947679c8304bcbcb9388256e92cb0056d16b1b2035efac6eae84831d6fa95bd41a2a SHA512 3bba0738840b966a0a58123f265de1951428c599f3af9c581e1becec17ba3a93233a231de0673dbb2dc0bb82d54096e0eed43846967bf232f412bb785ce3b23f
 DIST rebase-1703.tar.xz 122252304 BLAKE2B 26afca990e300a5c471f55b1a168b1930212a347b70dd3224a51894bb701540a27a0384bd250caee8e0d0dd4886c6664ab74b20bcfb71fd42d1c73ebf2ce6be6 SHA512 838bf5e09073ff8520403d955a8195298def1d792d1fd3044e7c8896c6202a0340c1e96dbe80e85c5801cd3be3ed63f19488101cca02d46cdf5f1d0521ede796
 DIST rebase-1704.tar.xz 124351900 BLAKE2B bdbda714cc07f744b56c83b80a1b0f0a724a990b200c615458852910f282761aaf37a312a388ec7fee94a62ead47e01ddca8b205f2ad05d780a299e7547206f7 SHA512 0e4019d41ccbae86b8cb1f6dfa4c34d3fccbe084a330f04f2fdb774186e35c761655e1619d9a90d444ea3bab0910df1b60cf9a249ee31d66a254d28dd6b32cc7
+DIST rebase-1803.tar.xz 152581448 BLAKE2B 7907f0aee9e202f062f5ec4b5e4a112cd0fb3900b3d65dc57ffe4832c5aac088f50c2661f1b9c1bb8b57e7b4f6d453bec2899b460383d06b4e679da13e92aad2 SHA512 ab718e87c33c975bc6a93d3c6be130c9751612b744dc5451bcfde5c10d3d9d68ed4a4d921fff1f48063bfa2e9f3c8a016d4e5e0afa4eb7e4131511767608534b
diff --git a/sci-biology/rebase/rebase-1803.ebuild b/sci-biology/rebase/rebase-1803.ebuild
new file mode 100644
index 000000000000..e9944bde30fb
--- /dev/null
+++ b/sci-biology/rebase/rebase-1803.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV#1}
+
+DESCRIPTION="A restriction enzyme database"
+HOMEPAGE="http://rebase.neb.com"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emboss minimal"
+
+RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="binchecks strip"
+
+src_compile() {
+	if use emboss; then
+		echo; einfo "Indexing Rebase for usage with EMBOSS."
+		mkdir REBASE || die
+		EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
+				-protofile proto.${MY_PV} -equivalences \
+				|| die "Indexing Rebase failed."
+		echo
+	fi
+}
+
+src_install() {
+	if ! use minimal; then
+		insinto /usr/share/${PN}
+		doins withrefm.${MY_PV} proto.${MY_PV}
+	fi
+	newdoc REBASE.DOC README
+	if use emboss; then
+		insinto /usr/share/EMBOSS/data/REBASE
+		doins REBASE/embossre.{enz,ref,sup}
+		insinto /usr/share/EMBOSS/data
+		doins REBASE/embossre.equ
+	fi
+}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index b8256a804f46..3c6f40e0666c 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/laszip/laszip-2.2.0.ebuild b/sci-geosciences/laszip/laszip-2.2.0.ebuild
index 1524c071b9d2..e0397f0829eb 100644
--- a/sci-geosciences/laszip/laszip-2.2.0.ebuild
+++ b/sci-geosciences/laszip/laszip-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LASzip/LASzip/releases/download/v${PV}/${PN}-src-${P
 
 SLOT="0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
 
 S="${WORKDIR}/${PN}-src-${PV}"
 
diff --git a/sci-geosciences/liblas/liblas-1.8.1.ebuild b/sci-geosciences/liblas/liblas-1.8.1.ebuild
index 083d66bcf08f..2b0d2893bd8a 100644
--- a/sci-geosciences/liblas/liblas-1.8.1.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1.ebuild
@@ -14,7 +14,7 @@ RESTRICT="test"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
 IUSE="gdal"
 
 RDEPEND="
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 0f5acf30d512..519fd3a41384 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/gdal/gdal-2.2.3-r1.ebuild b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
index aa2b79c9e5b7..57ee4454007f 100644
--- a/sci-libs/gdal/gdal-2.2.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.2"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
 
 COMMON_DEPEND="
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index f8335b91fb03..b6f65c970d1f 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -1,2 +1 @@
 DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e
-DIST silo-4.9.1.tar.gz 12038537 BLAKE2B 4c5bf6a4390333d659df96a302f6ee8f7a81325194cb6853c278e94b6c229da964103874c02fcb4b4f9f4985cf9b023ee3a553e1ca6237ccdbc5e7d9f64c1906 SHA512 512e16ec6bd62deb3596d918895a0c82606a9f519345e4c4abd1a19eb40172576b70313472b75ae4183ee9d86a0f19443504f232ca6e633b1652f9d547927b83
diff --git a/sci-libs/silo/files/silo-4.9.1-qtlibs.patch b/sci-libs/silo/files/silo-4.9.1-qtlibs.patch
deleted file mode 100644
index e8fc4284cac0..000000000000
--- a/sci-libs/silo/files/silo-4.9.1-qtlibs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru silo-4.9.1-old/configure silo-4.9.1-new/configure
---- silo-4.9.1-old/configure	2014-01-18 23:19:15.755030306 +0100
-+++ silo-4.9.1-new/configure	2014-01-18 23:20:52.595031159 +0100
-@@ -27503,7 +27503,7 @@
-         ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
-                      sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
-       fi
--      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-     else
-       # Use cached value or do search, starting with suggestions from
-       # the command line
-@@ -27577,7 +27577,7 @@
-       ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
-                    sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
-     fi
--    ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+    ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-   else
-     # There is no valid definition for $QTDIR as Trolltech likes to see it
-     ax_qt_dir=
-@@ -27589,7 +27589,7 @@
-         ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
-                      sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
-       fi
--      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-     else
-       # Normally, when there is no traditional Trolltech installation,
-       # the library is installed in a place where the linker finds it
-@@ -27607,7 +27607,7 @@
-       # See if we find the library without any special options.
-       # Don't add top $LIBS permanently yet
-       ax_save_LIBS="$LIBS"
--      LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-       ax_qt_LIBS="$LIBS"
-       ax_save_CXXFLAGS="$CXXFLAGS"
-       CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
-@@ -27668,7 +27668,7 @@
-         # That did not work. Try the multi-threaded version
-         echo "Non-critical error, please neglect the above." >&5
-         ax_qt_lib=qt-mt
--        LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+        LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-         cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27726,7 +27726,7 @@
-           # That did not work. Try the OpenGL version
-           echo "Non-critical error, please neglect the above." >&5
-           ax_qt_lib=qt-gl
--          LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+          LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-           cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27809,7 +27809,7 @@
-               fi
-             done
-             # Try with that one
--            LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+            LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-             cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/sci-libs/silo/files/silo-4.9.1-tests.patch b/sci-libs/silo/files/silo-4.9.1-tests.patch
deleted file mode 100644
index 2e0a52191d0e..000000000000
--- a/sci-libs/silo/files/silo-4.9.1-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/Makefile.in.old	2014-07-24 07:25:53.464381420 +0200
-+++ tests/Makefile.in	2014-07-24 07:26:14.951048323 +0200
-@@ -169,7 +169,7 @@
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(ioperf_stdio_la_LDFLAGS) $(LDFLAGS) -o $@
- rocket_silo_la_LIBADD =
--am_rocket_silo_la_OBJECTS = rocket_silo.lo
-+am_rocket_silo_la_OBJECTS = rocket_silo.lo ../src/.libs/libsilo.la
- rocket_silo_la_OBJECTS = $(am_rocket_silo_la_OBJECTS)
- rocket_silo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
diff --git a/sci-libs/silo/silo-4.10.2.ebuild b/sci-libs/silo/silo-4.10.2.ebuild
deleted file mode 100644
index 0c77dba873a7..000000000000
--- a/sci-libs/silo/silo-4.10.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fortran-2
-
-DESCRIPTION="A mesh and field I/O library and scientific database"
-HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo"
-SRC_URI="https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PN}/${P}/${P}.tar.gz"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +silex static-libs qt4 test"
-
-REQUIRED_USE="silex? ( qt4 )"
-
-RDEPEND="
-	hdf5? ( sci-libs/hdf5 )
-	qt4? ( dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-qtlibs.patch"
-	epatch "${FILESDIR}/${P}-tests.patch"
-	epatch "${FILESDIR}/${P}-mpiposix.patch"
-}
-
-src_configure() {
-	econf \
-		--enable-install-lite-headers \
-		--enable-shared \
-		$(use_enable silex silex ) \
-		$(use_enable static-libs static ) \
-		$(use_with qt4 Qt-lib-dir "${EPREFIX}"/usr/lib${LIB_LOCATION_SUFFIX}/qt4 ) \
-		$(use_with qt4 Qt-include-dir "${EPREFIX}"/usr/include/qt4 ) \
-		$(use_with hdf5 hdf5 ${EPREFIX}"/usr/include,${EPREFIX}"/usr/lib${LIB_LOCATION_SUFFIX} )
-}
diff --git a/sci-libs/silo/silo-4.9.1.ebuild b/sci-libs/silo/silo-4.9.1.ebuild
deleted file mode 100644
index 7c9677f14773..000000000000
--- a/sci-libs/silo/silo-4.9.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A mesh and field I/O library and scientific database"
-HOMEPAGE="https://wci.llnl.gov/codes/${PN}"
-SRC_URI="https://wci.llnl.gov/codes/${PN}/${P}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +silex static-libs qt4 test"
-
-REQUIRED_USE="silex? ( qt4 )"
-
-RDEPEND="
-	hdf5? ( sci-libs/hdf5 )
-	qt4? ( dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-qtlibs.patch"
-	epatch "${FILESDIR}/${P}-tests.patch"
-}
-
-src_configure() {
-	econf \
-		--enable-install-lite-headers \
-		--enable-shared \
-		$(use_enable silex silex ) \
-		$(use_enable static-libs static ) \
-		$(use_with qt4 Qt-lib-dir "${EPREFIX}"/usr/lib${LIB_LOCATION_SUFFIX}/qt4 ) \
-		$(use_with qt4 Qt-include-dir "${EPREFIX}"/usr/include/qt4 ) \
-		$(use_with hdf5 hdf5 ${EPREFIX}"/usr/include,${EPREFIX}"/usr/lib${LIB_LOCATION_SUFFIX} )
-}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index ca87b1c5c15b..0ca074323f64 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/xyscan/xyscan-4.3.0.ebuild b/sci-visualization/xyscan/xyscan-4.3.0.ebuild
index 383fa03de114..5c70e092144d 100644
--- a/sci-visualization/xyscan/xyscan-4.3.0.ebuild
+++ b/sci-visualization/xyscan/xyscan-4.3.0.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
-	app-text/poppler:=[qt5]
+	app-text/poppler[qt5]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8ce3761784ec..df2bad6bffcb 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest
index 46ed32780573..ecfc5412c4ee 100644
--- a/sys-apps/biosdisk/Manifest
+++ b/sys-apps/biosdisk/Manifest
@@ -1 +1 @@
-DIST biosdisk-git-06112010.tar.gz 1195889 BLAKE2B 7363402fea58e5709517ec2bc30865b352fa55472a8f4688f371f6080d850ba358f30d6c524a32f0f9df9a82092202814698e3452f4e9862a8f31349a8a3d545 SHA512 ade60e0e1ebb069e7f8d2046eff479cdb5186e54e0408b7fe65ac803476c9e325f9771617bbbcd60471d6b2d637aaef20c68af89c16c4ea26e04cfe501e4a310
+DIST biosdisk-0_p20171116.tar.gz 712587 BLAKE2B f09a8c68f57cddb1949d369cfc18d1216c3e64612a7074c58e6c50c12682fce92a4d6295810d5358fac0340483387f14059811a5681ae4f37c7da8e40c34fec4 SHA512 27d99990d0e92f1295d2ddb949214946db681e7f80c6606b252473fe7b5b0d3254180b54cb26479c9014219f6b989aa6ba29e8a818f3801f9ccce4efd2f1c3b9
diff --git a/sys-apps/biosdisk/biosdisk-0_p20100611-r1.ebuild b/sys-apps/biosdisk/biosdisk-0_p20100611-r1.ebuild
deleted file mode 100644
index 7ef0db6c40f9..000000000000
--- a/sys-apps/biosdisk/biosdisk-0_p20100611-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1
-
-MY_PV=$(get_version_component_range 2)
-MY_PV_YEAR=${MY_PV:1:4}
-MY_PV_MONTH=${MY_PV:5:2}
-MY_PV_DAY=${MY_PV:7:2}
-MY_PV="${MY_PV_MONTH}${MY_PV_DAY}${MY_PV_YEAR}"
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="A script that creates floppy boot images to flash Dell BIOSes"
-HOMEPAGE="http://en.community.dell.com/techcenter/os-applications/w/wiki/linux-projects.aspx"
-SRC_URI="http://linux.dell.com/biosdisk/${PN}-git-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="
-	>=app-text/dos2unix-5.0
-	sys-boot/syslinux
-	${PYTHON_DEPS}
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	python_fix_shebang blconf
-
-	dosbin biosdisk blconf
-
-	dodoc AUTHORS README README.dosdisk TODO VERSION
-	doman biosdisk.8.gz
-
-	insinto /usr/share/biosdisk
-	doins dosdisk.img dosdisk{288,8192}.img biosdisk-mkrpm-{fedora,redhat,generic}-template.spec
-
-	insinto /etc
-	doins biosdisk.conf
-}
diff --git a/sys-apps/biosdisk/biosdisk-0_p20171116.ebuild b/sys-apps/biosdisk/biosdisk-0_p20171116.ebuild
new file mode 100644
index 000000000000..87367d63b19d
--- /dev/null
+++ b/sys-apps/biosdisk/biosdisk-0_p20171116.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+EGIT_COMMIT="f534dd22a795dca9c42f44b52f206bf02eadb682"
+DESCRIPTION="A script that creates floppy boot images to flash Dell BIOSes"
+HOMEPAGE="https://github.com/dell/biosdisk"
+SRC_URI="https://github.com/dell/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=app-text/dos2unix-5.0
+	sys-boot/syslinux
+	${PYTHON_DEPS}
+"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_install() {
+	python_fix_shebang blconf
+
+	dosbin biosdisk blconf
+
+	dodoc AUTHORS README README.dosdisk TODO VERSION
+	gunzip biosdisk.8.gz || die
+	doman biosdisk.8
+
+	insinto /usr/share/biosdisk
+	doins dosdisk.img dosdisk{288,8192,20480}.img biosdisk-mkrpm-{fedora,redhat,generic}-template.spec
+
+	insinto /etc
+	doins biosdisk.conf
+}
diff --git a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
index e8a511253d15..01ebd90c83c0 100644
--- a/sys-apps/busybox/busybox-1.28.0.ebuild
+++ b/sys-apps/busybox/busybox-1.28.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	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
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index 1a28835356c0..210000076494 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1 +1,2 @@
 DIST colorized-logs-2.1.tar.gz 9997 BLAKE2B 5d6b184102c63dad8526f1feebbd84531a18f2505801f4bedd62cbdfa04bd919b750b60b37fec5449b1a5b98500dcbd7feec7b7155ca0c779d31ea66d8305e28 SHA512 d03919cfa19d6df41bcb9dd6bb29e436febff4ed4d50d9ce83910bfdb61acbf323ecd4dcf9eaa9cfae3bb338b2107f1d156815848b8da8b470c50651650dfee1
+DIST colorized-logs-2.3.tar.gz 10270 BLAKE2B 3b0798139e96512b4d544c76bcbece81283a77dd7deca8b018bb0ddd9535eb80f88b8f10a9a9a20c4f98b67cc97bb7673de80339bcc45c5ce46b8e8dfe53a53b SHA512 a15616f0548c0a91dc290fb6a9c6a8376b66ebc2fb1af21e1caed03c95c07b8536d8a81dd9e199d54ffa5339d0f777cabe75e23fda3bb916575fe3ac31bf51f9
diff --git a/sys-apps/colorized-logs/colorized-logs-2.3.ebuild b/sys-apps/colorized-logs/colorized-logs-2.3.ebuild
new file mode 100644
index 000000000000..bee91bfd74a9
--- /dev/null
+++ b/sys-apps/colorized-logs/colorized-logs-2.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Tools for logs with ANSI color"
+HOMEPAGE="https://github.com/kilobyte/colorized-logs/"
+SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake-utils_src_install
+	# Rename to not collide with dev-python/ansi2html
+	mv "${ED}/usr/bin/ansi2html" "${ED}/usr/bin/cl-ansi2html" || die
+	mv "${ED}/usr/share/man/man1/ansi2html.1" "${ED}/usr/share/man/man1/cl-ansi2html.1" || die
+}
diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild
index a7c2766ec442..ef2edc5aeaf9 100644
--- a/sys-apps/dbus/dbus-1.10.24.ebuild
+++ b/sys-apps/dbus/dbus-1.10.24.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/Manifest b/sys-apps/dmidecode/Manifest
index 73149901d341..55c8d2157540 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,3 +1,2 @@
-DIST dmidecode-2.12.tar.bz2 55191 BLAKE2B b04ecd5d53a17a5bab60754651ddc90030f3d99c851a747983c92adf0faeec7f92ac9864d6c54cf70893aaf90db8567f60b8d0c6d9f8d4330b6981fe7f26d278 SHA512 15d5a6dca04de48267f969f6866079915964a8a3abad083b1720a4425723f9c100770d05c0d475df9609c5b54741f231a587761d1beb1ae6de4b2836d60724c4
 DIST dmidecode-3.0.tar.xz 58704 BLAKE2B d3e22cfeb8f537f461523d0927cc5eb5fa6214638b8a9360b2159abff1b9f60c8a8753f24a233a77f7c413b074f9a910f000a0c49ca166ebf3297ad673e9fb93 SHA512 fa31190e43ae7a0b61f6313b45f5eba3ab66390accd587129419e48fca931b631cbb331d6893cf0c1bfca94c86ff8c557215166e0881dee93b3af10a86878eb1
 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
diff --git a/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild b/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild
deleted file mode 100644
index 03c53646f8f5..000000000000
--- a/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="http://www.nongnu.org/dmidecode/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-supported-smbios-version.patch"
-	sed -i \
-		-e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^docdir/s:dmidecode:${PF}:" \
-		-e '/^PROGRAMS !=/d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "dmidecode needs root privileges to read /dev/xsvc"
-		einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
-		einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
-		einfo "information without requiring root privileges."
-	fi
-}
diff --git a/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch b/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch
deleted file mode 100644
index 84feaca79ef9..000000000000
--- a/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -uNr dmidecode-2.12.ORIG/dmidecode.c dmidecode-2.12/dmidecode.c
---- dmidecode-2.12.ORIG/dmidecode.c	2014-05-06 14:24:27.703057950 +0100
-+++ dmidecode-2.12/dmidecode.c	2014-05-06 14:24:43.136058719 +0100
-@@ -69,7 +69,7 @@
- #define out_of_spec "<OUT OF SPEC>"
- static const char *bad_index = "<BAD INDEX>";
- 
--#define SUPPORTED_SMBIOS_VER 0x0207
-+#define SUPPORTED_SMBIOS_VER 0x0208
- 
- /*
-  * Type-independant Stuff
-@@ -712,7 +712,6 @@
- 		{ 0x3D, "Opteron 6200" },
- 		{ 0x3E, "Opteron 4200" },
- 		{ 0x3F, "FX" },
--
- 		{ 0x40, "MIPS" },
- 		{ 0x41, "MIPS R4000" },
- 		{ 0x42, "MIPS R4200" },
-@@ -729,7 +728,6 @@
- 		{ 0x4D, "Opteron 6300" },
- 		{ 0x4E, "Opteron 3300" },
- 		{ 0x4F, "FirePro" },
--
- 		{ 0x50, "SPARC" },
- 		{ 0x51, "SuperSPARC" },
- 		{ 0x52, "MicroSPARC II" },
-@@ -1176,7 +1174,7 @@
- 		"Socket LGA1356-3" /* 0x2C */
- 	};
- 
--	if (code >= 0x01 && code <= 0x2A)
-+	if (code >= 0x01 && code <= 0x2C)
- 		return upgrade[code - 0x01];
- 	return out_of_spec;
- }
-@@ -2236,7 +2234,7 @@
- 	if (code == 0)
- 		printf(" Unknown");
- 	else
--		printf(" %.3f V", (float)(i16)code / 1000);
-+		printf(" %.3f V", (float)code / 1000);
- }
- 
- static const char *dmi_memory_device_form_factor(u8 code)
-@@ -2338,7 +2336,7 @@
- 	{
- 		int i;
- 
--		for (i = 1; i <= 14; i++)
-+		for (i = 1; i <= 15; i++)
- 			if (code & (1 << i))
- 				printf(" %s", detail[i - 1]);
- 	}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 0801037042fa..450f15ba33d5 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,2 +1,3 @@
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
 DIST openrc-0.35.2.tar.gz 241600 BLAKE2B 09517a33ea7faf2e59d3a194876a3bb55a2477dde5f7f30915f77c24104531a27e752a59a049929878a115710ecbe1ed116e4283357f88c65cbe130787b88220 SHA512 61282509bae087a6c94a1947a30eddfa633cd2dbc91392511daa7240318d9f0c0a231005e329b6e46eece194fe497071f40387bea46d27ef09db9eb6e92f07d6
+DIST openrc-0.35.3.tar.gz 241587 BLAKE2B e8560243adb6ba4e6e463ad8906f203282ee9e0d16a22c0cf28e3ac7fe22321bb90f5292998745a70c269cee2a82bc6c899cba9ecf07a2e28bd4dc02c0fc737a SHA512 2f247241fb6a7abb972efbd308c47f5621b7a10b11fce2fbbffe6ccb73c6d054bd2d1b860bf9d7bc38f6e2f0ed204a60eecad312347f394efb85b096a513eff1
diff --git a/sys-apps/openrc/openrc-0.35.3.ebuild b/sys-apps/openrc/openrc-0.35.3.ebuild
new file mode 100644
index 000000000000..3420adf2a4c3
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.35.3.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKZSHCOMP=yes"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /lib/rc/init.d
+	fi
+	keepdir /lib/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+
+	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
+
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
index d0801ab01b6d..a373d25270d0 100644
--- a/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
+++ b/sys-apps/paludis/paludis-3.0.0_pre20170808.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://git.exherbo.org/paludis/paludis.git/snapshot/${MY_P}.tar.xz"
 IUSE="doc pbins pink python ruby ruby_targets_ruby${RUBY_VER/./} search-index test +xml"
 LICENSE="GPL-2 vim"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-admin/eselect-1.2.13
diff --git a/sys-apps/portage/portage-2.3.24-r1.ebuild b/sys-apps/portage/portage-2.3.24-r1.ebuild
index f66dbf9d9b8a..36b6e0929318 100644
--- a/sys-apps/portage/portage-2.3.24-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.24-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr"
 
diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
index ea2a7bdbf75c..504b6a5e4649 100644
--- a/sys-apps/sed/metadata.xml
+++ b/sys-apps/sed/metadata.xml
@@ -9,6 +9,10 @@
 	<remote-id type="sourceforge">sed</remote-id>
 </upstream>
 <use>
-	<flag name="forced-sandbox">Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)</flag>
+	<flag name="forced-sandbox">
+		Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands).
+		Note: This may break many configure scripts, so it should be avoided on dev systems
+		(and generally used on binpkg/final systems only).
+	</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild
index ad3f071a2b1b..b6da5a256ce2 100644
--- a/sys-apps/sed/sed-4.2.2.ebuild
+++ b/sys-apps/sed/sed-4.2.2.ebuild
@@ -22,13 +22,11 @@ DEPEND="${RDEPEND}
 
 src_bootstrap_sed() {
 	# make sure system-sed works #40786
-	export NO_SYS_SED=""
 	if ! type -p sed > /dev/null ; then
-		NO_SYS_SED="!!!"
-		./bootstrap.sh || die "couldnt bootstrap"
-		cp sed/sed "${T}"/ || die "couldnt copy"
-		export PATH="${PATH}:${T}"
-		make clean || die "couldnt clean"
+		mkdir -p "${T}/bootstrap"
+		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
+		chmod a+rx "${T}/bootstrap/sed"
+		PATH="${T}/bootstrap:${PATH}"
 	fi
 }
 
diff --git a/sys-apps/sed/sed-4.3-r1.ebuild b/sys-apps/sed/sed-4.3-r1.ebuild
index b0be9297fb01..e70a45187922 100644
--- a/sys-apps/sed/sed-4.3-r1.ebuild
+++ b/sys-apps/sed/sed-4.3-r1.ebuild
@@ -26,13 +26,11 @@ PATCHES=(
 
 src_bootstrap_sed() {
 	# make sure system-sed works #40786
-	export NO_SYS_SED=""
 	if ! type -p sed > /dev/null ; then
-		NO_SYS_SED="!!!"
-		./bootstrap.sh || die "couldnt bootstrap"
-		cp sed/sed "${T}"/ || die "couldnt copy"
-		export PATH="${PATH}:${T}"
-		make clean || die "couldnt clean"
+		mkdir -p "${T}/bootstrap"
+		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
+		chmod a+rx "${T}/bootstrap/sed"
+		PATH="${T}/bootstrap:${PATH}"
 	fi
 }
 
diff --git a/sys-apps/sed/sed-4.4-r1.ebuild b/sys-apps/sed/sed-4.4-r1.ebuild
index 26c3858da53b..39c3d130eacf 100644
--- a/sys-apps/sed/sed-4.4-r1.ebuild
+++ b/sys-apps/sed/sed-4.4-r1.ebuild
@@ -21,14 +21,12 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_bootstrap_sed() {
-	# make sure system-sed works #40786
-	export NO_SYS_SED=""
-	if ! type -p sed > /dev/null ; then
-		NO_SYS_SED="!!!"
-		./bootstrap.sh || die "couldnt bootstrap"
-		cp sed/sed "${T}"/ || die "couldnt copy"
-		export PATH="${PATH}:${T}"
-		emake clean
+	# make sure system-sed works #40786 #650052
+	if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then
+		mkdir -p "${T}/bootstrap"
+		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
+		chmod a+rx "${T}/bootstrap/sed"
+		PATH="${T}/bootstrap:${PATH}"
 	fi
 }
 
diff --git a/sys-apps/sed/sed-4.4.ebuild b/sys-apps/sed/sed-4.4.ebuild
index aa52e2921cdc..3bdb8e28ac20 100644
--- a/sys-apps/sed/sed-4.4.ebuild
+++ b/sys-apps/sed/sed-4.4.ebuild
@@ -25,13 +25,11 @@ DEPEND="${RDEPEND}
 
 src_bootstrap_sed() {
 	# make sure system-sed works #40786
-	export NO_SYS_SED=""
 	if ! type -p sed > /dev/null ; then
-		NO_SYS_SED="!!!"
-		./bootstrap.sh || die "couldnt bootstrap"
-		cp sed/sed "${T}"/ || die "couldnt copy"
-		export PATH="${PATH}:${T}"
-		make clean || die "couldnt clean"
+		mkdir -p "${T}/bootstrap"
+		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
+		chmod a+rx "${T}/bootstrap/sed"
+		PATH="${T}/bootstrap:${PATH}"
 	fi
 }
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 523a447c9333..89680543c30d 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index f7f5bfee46b7..d7c94d44b5b7 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,8 +1,6 @@
 DIST heat-10.0.0.tar.gz 2349675 BLAKE2B 24968c117d19e69638dbddd6d25d34f05e1454f788187049f1f35a067e029afe141693f41b497031e2ebb039cea2475bcf13ad814a21844540d41f1a2e4260ef SHA512 43a5ab5330a830657cc5265875240d85d442404db1bb3ff7372acc28fc4b8f410414704a928765cf97eb550fa47d0bd228ad62efb098093552baba0f1e1305e9
-DIST heat-9.0.2.tar.gz 2364044 BLAKE2B ca2c6e1f504e7b443906e1c33d2105293313223d9af851a5c46719b5c74d95687d11ea2460f7fc3e818719c9132bb8e0041b4ae123d5a0eb12b5bff22606f474 SHA512 c27dbcd74abed231b5e375461c03e32d5a55c08d04619bf7f315baad14fb20e2041aa92656b7e597bc7c804533c6496f569ce450e81a52cab5735d6d84af2734
 DIST heat-9.0.3.tar.gz 2364843 BLAKE2B 4edbd6716a84e6003cd02511e8c8036c84510bd4d842d9a32caae7c837bee591fb46d3edc8786d8015b8ffd09d4dde7bde4f49a6994766af40284715b2b99713 SHA512 5db5f0189da095951963d2cf30c7c3279e40537041a66b3d13cfebd13ba4256b74db49ba6269e14b2c4e21d10b7b00e77d5b94050e30c436dc271b406e4e9432
 DIST heat.conf.sample-10.0.0 92161 BLAKE2B 745cdb4eb6006079201cfe31b6486a5d759a93d1deceb42c3e9c5224b9512437013a5f44eb0f81694949efad648559a1b4e436992a91986206e50b65c69a09b8 SHA512 44b9f0e5779a21afc73a2720181ffaf778d5e54f61db7b177b59a777985c6155dac1d6b535eed311be372236f4d39d0601a8814c5ad7aa0c48acf3771bf65120
 DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 DIST heat.conf.sample-2018.1.9999 92161 BLAKE2B 745cdb4eb6006079201cfe31b6486a5d759a93d1deceb42c3e9c5224b9512437013a5f44eb0f81694949efad648559a1b4e436992a91986206e50b65c69a09b8 SHA512 44b9f0e5779a21afc73a2720181ffaf778d5e54f61db7b177b59a777985c6155dac1d6b535eed311be372236f4d39d0601a8814c5ad7aa0c48acf3771bf65120
-DIST heat.conf.sample-9.0.2 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 DIST heat.conf.sample-9.0.3 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
diff --git a/sys-cluster/heat/heat-9.0.2.ebuild b/sys-cluster/heat/heat-9.0.2.ebuild
deleted file mode 100644
index 9de5bb7102cf..000000000000
--- a/sys-cluster/heat/heat-9.0.2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${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/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.9.17[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zunclient-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${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.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[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.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup heat
-	enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	doins "etc/heat/policy.json"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-}
diff --git a/sys-cluster/heat/heat-9.0.3.ebuild b/sys-cluster/heat/heat-9.0.3.ebuild
index 472f8a0a47db..88da01b25fb9 100644
--- a/sys-cluster/heat/heat-9.0.3.ebuild
+++ b/sys-cluster/heat/heat-9.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
 		https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 4af38acc5885..168ca9209238 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1,2 @@
-DIST slurm-16.05.11.tar.bz2 6100281 BLAKE2B d9e368f22f55c457e2fb6caaca0a496e6de1c0c77af891e62259db88fa7fca68d4df0731f1a6cada046341698e673860eb7d3883ef9dba8589fc01c7882a1735 SHA512 6922f6987a586288ea8229b4603b42c705ea159af4ceb3763790ba5cc2fb8dabf7747d7a27a886d50eeb3a7ed743c26b86354b9d05802c46ecd86b215ace85ba
 DIST slurm-17.02.9.tar.bz2 6053443 BLAKE2B 73635de40d0f083de068306cae933a499a9df24790caf12859a64f7e61a0a77a4383137f5f6cf65699e6c07bd2e240c9cf74be4378124f71047e18e99bbbff55 SHA512 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c
+DIST slurm-17.11.4.tar.bz2 6203468 BLAKE2B 8f79fa83c6c196da6c1f47f83a763d044e86192ac584f4afad20ed1c57aac051b9f308c03d7d670ff9c974663d7931a6ccaae55dd49d2135fc08fb81c4aa50e4 SHA512 027f7dee51980f1351c56934ebdf510cf72c049544cdfbbfc450223b5e27a9d21b9f6fcf7a3a043b7cc18c913e9ce6dcd8d0153a5e7625c84cc9a67b69832962
diff --git a/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch b/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch
deleted file mode 100644
index f9d22f479f89..000000000000
--- a/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch
+++ /dev/null
@@ -1,34 +0,0 @@
- configure.ac                                  | 2 +-
- src/plugins/task/cgroup/task_cgroup_devices.c | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 869a989..2936983 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -141,7 +141,7 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h  \
- AC_HEADER_SYS_WAIT
- AC_HEADER_TIME
- AC_HEADER_STDC
--
-+AC_HEADER_MAJOR
- 
- dnl Checks for structures.
- dnl
-diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c
-index 554583c..9be99d8 100644
---- a/src/plugins/task/cgroup/task_cgroup_devices.c
-+++ b/src/plugins/task/cgroup/task_cgroup_devices.c
-@@ -42,6 +42,12 @@
- #include <sched.h>
- #include <glob.h>
- #include <sys/types.h>
-+#ifdef MAJOR_IN_MKDEV
-+#  include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+#  include <sys/sysmacros.h>
-+#endif
- #include <sys/stat.h>
- #include <slurm/slurm.h>
- #include <slurm/slurm_errno.h>
diff --git a/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
new file mode 100644
index 000000000000..eec43fb449c0
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
@@ -0,0 +1,16 @@
+ src/plugins/node_features/knl_cray/node_features_knl_cray.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/node_features/knl_cray/node_features_knl_cray.c b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
+index 51f72df226..3a5ffef60d 100644
+--- a/src/plugins/node_features/knl_cray/node_features_knl_cray.c
++++ b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
+@@ -2986,7 +2986,7 @@ extern void node_features_p_step_config(bool mem_sort, bitstr_t *numa_bitmap)
+ 	if (mem_sort && (numa_available() != -1)) {
+ 		struct stat sb;
+ 		int buf_len, fd, i, len, rc;
+-		char buf[8];
++		char buf[10];
+ 
+ 		if (stat(ZONE_SORT_PATH, &sb) == -1) {
+ 			rc = system(MODPROBE_PATH " zonesort_module");
diff --git a/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
similarity index 62%
rename from sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
index 1e4a5b4fae3a..f7e2c5b26739 100644
--- a/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch
+++ b/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
@@ -1,7 +1,13 @@
-diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
---- slurm-16.05.2.orig/configure.ac	2016-07-07 02:51:37.000000000 +0300
-+++ slurm-16.05.2/configure.ac	2016-07-15 20:02:41.373270765 +0300
-@@ -261,44 +261,6 @@
+ configure.ac             | 39 ---------------------------------------
+ doc/man/man1/Makefile.am |  8 --------
+ src/Makefile.am          |  3 +--
+ 3 files changed, 1 insertion(+), 49 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f177ec..ff4d69b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES)
  PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"])
  AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
  
@@ -43,10 +49,10 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
 -
 -AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"])
 -
- X_AC_DATABASES
- 
  dnl Cray ALPS/Basil support depends on mySQL
-@@ -503,7 +465,6 @@
+ X_AC_CRAY
+ 
+@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile
  		 src/sshare/Makefile
  		 src/sstat/Makefile
  		 src/strigger/Makefile
@@ -54,16 +60,40 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
  		 src/plugins/Makefile
  		 src/plugins/accounting_storage/Makefile
  		 src/plugins/accounting_storage/common/Makefile
-diff -urN slurm-16.05.2.orig/src/Makefile.am slurm-16.05.2/src/Makefile.am
---- slurm-16.05.2.orig/src/Makefile.am	2016-07-07 02:51:37.000000000 +0300
-+++ slurm-16.05.2/src/Makefile.am	2016-07-15 20:02:41.373270765 +0300
-@@ -27,8 +27,7 @@
+diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am
+index 246f16d..ba39af2 100644
+--- a/doc/man/man1/Makefile.am
++++ b/doc/man/man1/Makefile.am
+@@ -29,10 +29,6 @@ if WITH_BLCR
+ man1_MANS += srun_cr.1
+ endif
+ 
+-if BUILD_SVIEW
+-man1_MANS += sview.1
+-endif
+-
+ EXTRA_DIST = $(man1_MANS)
+ 
+ if HAVE_MAN2HTML
+@@ -65,10 +61,6 @@ if WITH_BLCR
+ html_DATA += srun_cr.html
+ endif
+ 
+-if BUILD_SVIEW
+-html_DATA += sview.html
+-endif
+-
+ MOSTLYCLEANFILES = ${html_DATA}
+ 
+ EXTRA_DIST += $(html_DATA)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bcd5aa7..a8cbf17 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -28,5 +28,4 @@ SUBDIRS =		\
  	srun_cr		\
  	sshare		\
  	sstat		\
 -	strigger	\
 -	sview
 +	strigger
- 
- if !REAL_BG_L_P_LOADED
- SUBDIRS += srun
diff --git a/sys-cluster/slurm/slurm-16.05.11.ebuild b/sys-cluster/slurm/slurm-17.11.4.ebuild
similarity index 74%
rename from sys-cluster/slurm/slurm-16.05.11.ebuild
rename to sys-cluster/slurm/slurm-17.11.4.ebuild
index 6f935a075773..0b943a40504f 100644
--- a/sys-cluster/slurm/slurm-16.05.11.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,19 +17,19 @@ else
 	fi
 	MY_P="${PN}-${MY_PV}"
 	INHERIT_GIT=""
-	SRC_URI="https://www.schedmd.com/download/latest/${MY_P}.tar.bz2"
+	SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT}
 
-DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
+DESCRIPTION="A Highly Scalable Resource Manager"
 HOMEPAGE="https://www.schedmd.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
+IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
 
 DEPEND="
 	!sys-cluster/torque
@@ -54,7 +54,7 @@ RESTRICT="primaryuri test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-disable-sview.patch
-	"${FILESDIR}"/${P}-sysmacros.patch
+	"${FILESDIR}"/${P}-buffer.patch
 )
 
 src_unpack() {
@@ -71,10 +71,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [ ${#PATCHES[0]} -ne 0 ]; then
-		epatch "${PATCHES[@]}"
-	fi
-	eapply_user
+	default
+
 	# pids should go to /var/run/slurm
 	sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \
 		-e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \
@@ -101,6 +99,7 @@ src_configure() {
 			--docdir="${EPREFIX}/usr/share/doc/${P}"
 			--htmldir="${EPREFIX}/usr/share/doc/${P}"
 			)
+	use debug || myconf+=( --disable-debug )
 	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
 	use mysql || myconf+=( --without-mysql_config )
 	econf "${myconf[@]}" \
@@ -113,19 +112,21 @@ src_configure() {
 	# --htmldir does not seems to propagate... Documentations are installed
 	# in /usr/share/doc/slurm-2.3.0/html
 	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" -i doc/html/Makefile || die
+	sed \
+		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
+		-i doc/html/Makefile || die
 	if use perl ; then
 		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs"
-		mkdir -p "${S}/src/db_api/.libs"
-		touch "${S}/src/api/.libs/libslurm.so"
-		touch "${S}/src/db_api/.libs/libslurmdb.so"
-		cd "${LIBSLURM_PERL_S}"
+		mkdir -p "${S}/src/api/.libs" || die
+		mkdir -p "${S}/src/db_api/.libs" || die
+		touch "${S}/src/api/.libs/libslurm.so" || die
+		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
+		cd "${LIBSLURM_PERL_S}" || die
 		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}"
+		cd "${LIBSLURMDB_PERL_S}" || die
 		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}"
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs"
+		cd "${S}" || die
+		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
 	fi
 }
 
@@ -133,26 +134,24 @@ src_compile() {
 	default
 	use pam && emake -C contribs/pam
 	if use perl ; then
-		cd "${LIBSLURM_PERL_S}"
+		cd "${LIBSLURM_PERL_S}" || die
 		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}"
+		cd "${LIBSLURMDB_PERL_S}" || die
 		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}"
-	fi
-	if use torque ; then
-		emake -C contribs/torque
+		cd "${S}" || die
 	fi
+	use torque && emake -C contribs/torque
 }
 
 src_install() {
 	default
 	use pam && emake DESTDIR="${D}" -C contribs/pam install
 	if use perl; then
-		cd "${LIBSLURM_PERL_S}"
+		cd "${LIBSLURM_PERL_S}" || die
 		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}"
+		cd "${LIBSLURMDB_PERL_S}" || die
 		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}"
+		cd "${S}" || die
 	fi
 	if use torque; then
 		emake DESTDIR="${D}" -C contribs/torque
@@ -162,30 +161,29 @@ src_install() {
 	# install sample configs
 	keepdir /etc/slurm
 	insinto /etc/slurm
-	doins etc/bluegene.conf.example
-	doins etc/cgroup.conf.example
-	doins etc/cgroup_allowed_devices_file.conf.example
-	doins etc/slurm.conf.example
-	doins etc/slurmdbd.conf.example
+	doins \
+		etc/bluegene.conf.example \
+		etc/cgroup.conf.example \
+		etc/cgroup_allowed_devices_file.conf.example \
+		etc/slurm.conf.example \
+		etc/slurmdbd.conf.example
 	exeinto /etc/slurm
-	doexe etc/cgroup.release_common.example
-	doexe etc/slurm.epilog.clean
+	doexe \
+		etc/slurm.epilog.clean
 	# install init.d files
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
+	newinitd "$(prefixify_ro ${FILESDIR}/slurmd.initd)" slurmd
+	newinitd "$(prefixify_ro ${FILESDIR}/slurmctld.initd)" slurmctld
+	newinitd "$(prefixify_ro ${FILESDIR}/slurmdbd.initd)" slurmdbd
 	# install conf.d files
 	newconfd "${FILESDIR}/slurm.confd" slurm
 	# Install logrotate file
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/logrotate" slurm
-	# cgroups support
-	exeinto /etc/slurm/cgroup
-	doexe etc/cgroup.release_common.example
-	mv "${ED}"/etc/slurm/cgroup/{cgroup.release_common.example,release_common} || die "Can't move cgroup.release_common.example"
-	ln -s release_common "${ED}"/etc/slurm/cgroup/release_cpuset  || die "Can't create symbolic link release_cpuset"
-	ln -s release_common "${ED}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices"
-	ln -s release_common "${ED}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer"
+
+	newbashcomp contribs/slurm_completion_help/slurm_completion.sh ${PN}
+	bashcomp_alias \
+		sreport sacctmgr scontrol squeue scancel sshare sbcast sinfo \
+		sprio sacct salloc sbatch srun sattach sdiag sstat
 }
 
 pkg_preinst() {
@@ -214,12 +212,12 @@ pkg_postinst() {
 	for folder_path in ${paths[@]}; do
 		create_folders_and_fix_permissions $folder_path
 	done
-	einfo
+	echo
 
 	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
 	elog "through a (javascript enabled) browser to create a configureation file."
 	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	einfo
+	echo
 	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
 	elog "Your kernel must be compiled with the wanted cgroup feature:"
 	elog "    General setup  --->"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 65c639f3b441..876bc8013acb 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index f151e74c3308..c924b38b281c 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -4,6 +4,7 @@ DIST automake-1.12.6.tar.xz 1400336 BLAKE2B b1d9befdda70f9caab881c1159921ea883a7
 DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1aac59bdc0d941077fde9be7742da0f57b48d678169e7a0e8b652c3ef46c314cdd3efb0fc489c389852fed1c39a02 SHA512 c9b145c1b822a4d83f2899f4280a76ccae932301b273f4c9718dc7f53161aa03dc1be2c1fb1a61083c54186e1908ae2c8284250aa1d8f6dea484767aca1344d3
 DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c63df8198d06a904a236745053072cb14ca4b333fb6cf370ef73378ee8771f4c10bcc111dcbd69e40f75abc16475fa SHA512 5de971159dfca2ec74c3c9a2f1368331efc437b146d675740c8735fcb0d32a30d0560fd29df64c3279efdf9278152c82a9ff09040b3e64d84743aaf25b26ce69
 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
+DIST automake-1.16.1.tar.xz 1534936 BLAKE2B 0a3b42375361ff3c07e861eb2974fa094f8e76e4c6fcad02d6413402d201506b1cd660a187ffa1d2b29d8955ef60088f7b07d96405d803895b593b35b78f443a SHA512 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3
 DIST automake-1.16.tar.xz 1534632 BLAKE2B e107c71c7c9675a85642396e8905331776193ecba6b92cff01ea83decb822cdafe6be515faf736f32be1264230845a46a2113d590e712b2d82d10728394c6fd8 SHA512 5ed8bed7cf823b1a1ea9090c81d2ec8affa516697ba109929ffca8724d25f13228fcaa3b5490f275c34fb4b523df423e32f900795bd6c51964703c91d1fe1ac9
 DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e
 DIST automake-1.5.tar.gz 526934 BLAKE2B 4b613c81f933d550cc9e5e40dd9ce1160f49c388f4e9292b1a8843b0f4cfc57d72a3dc10bce03260cffa61ab8d67a5b27d781bd7a4c2d842764135158dc2b54f SHA512 b9dbece18935b6c08f7d17c456b0359a17362dc030692629cf5d66db675e46a5f24d60dfd20a50780e4096163454f1922d4281c4bb7af336d61e527b579e3bfc
diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
index 3b9d4576cd2e..0506f165fec3 100644
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-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="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild
index 47c8b6d46ecd..22fda25274f1 100644
--- a/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-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="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
index 8ce777683ba3..f48c8b0970ad 100644
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-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="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 2df4eb3835c3..0fcfa230be0e 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-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="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
index 4e59b967b3f9..a3788aa7084d 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-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="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
index 6d6c8322a185..87ce3915c367 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	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"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.16.1.ebuild b/sys-devel/automake/automake-1.16.1.ebuild
new file mode 100644
index 000000000000..4ef29d02f84e
--- /dev/null
+++ b/sys-devel/automake/automake-1.16.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 versionator
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
+
+	inherit git-r3
+else
+	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"
+	if [[ ${PV/_beta} == ${PV} ]]; then
+		MY_P=${P}
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+	else
+		MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
+		MY_P="${PN}-${MY_PV}"
+
+		# Alpha/beta releases are not distributed on the usual mirrors.
+		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+	fi
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+IUSE="test"
+
+RDEPEND="dev-lang/perl
+	>=sys-devel/automake-wrapper-10
+	>=sys-devel/autoconf-2.69:*
+	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	export WANT_AUTOCONF=2.5
+	# Don't try wrapping the autotools this thing runs as it tends
+	# to be a bit esoteric, and the script does `set -e` itself.
+	./bootstrap || die
+	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+
+	# Bug 628912
+	if ! has_version sys-apps/texinfo ; then
+		touch doc/{stamp-vti,version.texi,automake.info} || die
+	fi
+}
+
+# slot the info pages.  do this w/out munging the source so we don't have
+# to depend on texinfo to regen things.  #464146 (among others)
+slot_info_pages() {
+	pushd "${ED%/}"/usr/share/info >/dev/null || die
+	rm -f dir || die
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null || die
+}
+
+src_install() {
+	default
+
+	slot_info_pages
+	rm "${ED%/}"/usr/share/aclocal/README || die
+	rmdir "${ED%/}"/usr/share/aclocal || die
+	rm \
+		"${ED%/}"/usr/bin/{aclocal,automake} \
+		"${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}
diff --git a/sys-devel/automake/automake-1.9.6-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild
index 0cb426b7899d..a45178508903 100644
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-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="test"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index fe0a51c196a7..4ef29d02f84e 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -42,8 +42,6 @@ DEPEND="${RDEPEND}
 	sys-apps/help2man
 	test? ( ${PYTHON_DEPS} )"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch )
-
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/sys-devel/clang-runtime/clang-runtime-6.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-6.0.0.ebuild
index 3f33f23fd1ea..da0933c9b990 100644
--- a/sys-devel/clang-runtime/clang-runtime-6.0.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-6.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 
 RDEPEND="
diff --git a/sys-devel/clang/clang-6.0.0.ebuild b/sys-devel/clang/clang-6.0.0.ebuild
index e6a5cb693b98..7e9999198164 100644
--- a/sys-devel/clang/clang-6.0.0.ebuild
+++ b/sys-devel/clang/clang-6.0.0.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/ct-ng/ct-ng-1.22.0.ebuild b/sys-devel/ct-ng/ct-ng-1.22.0.ebuild
index a1002aaa002b..a9aa2651dc91 100644
--- a/sys-devel/ct-ng/ct-ng-1.22.0.ebuild
+++ b/sys-devel/ct-ng/ct-ng-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit bash-completion-r1
 
 DESCRIPTION="crosstool-ng is a tool to build cross-compiling toolchains"
-HOMEPAGE="http://crosstool-ng.org"
+HOMEPAGE="https://crosstool-ng.github.io/"
 MY_P=${P/ct/crosstool}
 SRC_URI="http://ymorin.is-a-geek.org/download/crosstool-ng/${MY_P}.tar.bz2"
 
diff --git a/sys-devel/ct-ng/ct-ng-1.23.0.ebuild b/sys-devel/ct-ng/ct-ng-1.23.0.ebuild
index 42a61e626953..3ee43cbeace6 100644
--- a/sys-devel/ct-ng/ct-ng-1.23.0.ebuild
+++ b/sys-devel/ct-ng/ct-ng-1.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit bash-completion-r1
 
 DESCRIPTION="crosstool-ng is a tool to build cross-compiling toolchains"
-HOMEPAGE="http://crosstool-ng.org"
+HOMEPAGE="https://crosstool-ng.github.io/"
 MY_P=${P/ct/crosstool}
 SRC_URI="http://ymorin.is-a-geek.org/download/crosstool-ng/${MY_P}.tar.bz2"
 
diff --git a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
index 7ee0b1b96e86..609ae7a81f7d 100644
--- a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"
diff --git a/sys-devel/lld/lld-6.0.0.ebuild b/sys-devel/lld/lld-6.0.0.ebuild
index 4c04af2c1064..f797ef986a5f 100644
--- a/sys-devel/lld/lld-6.0.0.ebuild
+++ b/sys-devel/lld/lld-6.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/llvm-common-6.0.0.ebuild b/sys-devel/llvm-common/llvm-common-6.0.0.ebuild
index 1bc743641801..b4d44abdf980 100644
--- a/sys-devel/llvm-common/llvm-common-6.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-6.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm/llvm-6.0.0.ebuild b/sys-devel/llvm/llvm-6.0.0.ebuild
index cf9585069ad3..18abd811e408 100644
--- a/sys-devel/llvm/llvm-6.0.0.ebuild
+++ b/sys-devel/llvm/llvm-6.0.0.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc gold libedit +libffi ncurses test xar xml
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/llvmgold/llvmgold-6.ebuild b/sys-devel/llvmgold/llvmgold-6.ebuild
index 4a3e3e979fb4..42d6a38e57b5 100644
--- a/sys-devel/llvmgold/llvmgold-6.ebuild
+++ b/sys-devel/llvmgold/llvmgold-6.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz
index 523f3e32a8c4..d4d368210e3c 100644
Binary files a/sys-freebsd/Manifest.gz and b/sys-freebsd/Manifest.gz differ
diff --git a/sys-freebsd/freebsd-lib/files/ftpd.pamd b/sys-freebsd/freebsd-lib/files/ftpd.pamd
deleted file mode 100644
index 8e9082373f8f..000000000000
--- a/sys-freebsd/freebsd-lib/files/ftpd.pamd
+++ /dev/null
@@ -1,8 +0,0 @@
-# PAM configuration for the "ftpd" service
-#
-
-auth		include         system-auth
-account		include         system-auth
-password	include         system-auth
-session		include         system-auth
-
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 8bec9cc44d6f..8ed85789b886 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index d131bb2ef536..7da838752d13 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -13,6 +13,10 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <use>
     <flag name="convert">Build ext2 conversion utility (btrfs-convert)</flag>
     <flag name="reiserfs">Enable reiserfs support in btrfs-convert tool.</flag>
diff --git a/sys-fs/fuseiso/fuseiso-20070708-r1.ebuild b/sys-fs/fuseiso/fuseiso-20070708-r2.ebuild
similarity index 66%
rename from sys-fs/fuseiso/fuseiso-20070708-r1.ebuild
rename to sys-fs/fuseiso/fuseiso-20070708-r2.ebuild
index 30d3f56f6ded..988e0c3fc111 100644
--- a/sys-fs/fuseiso/fuseiso-20070708-r1.ebuild
+++ b/sys-fs/fuseiso/fuseiso-20070708-r2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Fuse module to mount ISO9660"
 HOMEPAGE="https://sourceforge.net/projects/fuseiso"
@@ -13,16 +11,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="sys-fs/fuse
+RDEPEND="sys-fs/fuse:=
 	sys-libs/zlib
 	dev-libs/glib:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-largeiso.patch"
-	epatch "${FILESDIR}/${P}-fix-typo.patch" # bug #482078
-	epatch_user
-}
+PATCHES=( ${FILESDIR}/${P}-largeiso.patch ${FILESDIR}/${P}-fix-typo.patch )
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 17f3d98ea3d0..deb90a0822b1 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 18ed889b055c..7287aec9b2a3 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -52,12 +52,18 @@ DIST genpatches-4.14-29.extras.tar.xz 17480 BLAKE2B 4e7ec2ac266170e066a1cdded463
 DIST genpatches-4.14-30.base.tar.xz 820012 BLAKE2B 06b2f018bceeb0456c396f97119c4fbff110324528376b5e159ab85e22911e021d0af8cb0216e04d6930e63a9a232fbb9f5e9e81fa6064d9368aa8441b8951a2 SHA512 3956ab075f16f1fe229a065a390a3242c7bf16ccfea6bbffb4ea13282594ceb19a52ee33d143302ad845889e60caa80e984873a3c981646aadec43aa72a7b765
 DIST genpatches-4.14-30.experimental.tar.xz 5184 BLAKE2B 4a44f3d3fef089140e6420c26d1c4102d518ce615abc30afb8127ede4328c276e3380502c2b28d5f452d8c7881130f0d2d7b04f0f81ce44f02db7b280493a12c SHA512 ddf304f14c9c714c32423b349c8740bd0785c5893ea7cfcf89895f0b76214693dff142c7fa5c40df09f55696b845210e3be8bda4fbf7deacff1718a83f83047a
 DIST genpatches-4.14-30.extras.tar.xz 17484 BLAKE2B 919091a255d5ec058e52c151caad2afe470b401a9ab5269946a2309ddee3a2b5068df8483807ee310832c690bb561700363a2b1c0294a4e15ca03dff36061890 SHA512 3a426bf63ffe786984cc8b9c296b0393fcaa9881c65d4220cadb331fe445fc05418a629cd5494f0a1419215d4512679d9619c8a92f4a10b2ad8087fa44292ffb
+DIST genpatches-4.14-31.base.tar.xz 823544 BLAKE2B 903479b10319b73fa2bfde8c7b8ec1ff5c90fbfdc2e9e3f28581499fa57c7d370c05462e7aa1402f0a35ec60687897e39c25e703a33a9ca376879ebebf239633 SHA512 660b2d7328ae2f7555d2f4869e8068cf94a56f84cd019ace3d6c6149925f867e440c4fddb37aa362e8639b9d12d09164b7046486b347e2499afe0b9adfeb88f5
+DIST genpatches-4.14-31.experimental.tar.xz 5184 BLAKE2B f67c68b74d74ba81499e36cae871656b07fc6c40ca890d2b5edb9137b5672652bc3c5bfdd46f322b64b7863776e76485370b23c8a5b03b8de16730bb9b265a53 SHA512 83b60e68991ee73488f5919d26308615361b95a4dca153d9f1d58e360a7e4370b18c34aaaf572f853fad08aab7636fde67a45c371e37f56abcd5b44c32f62b6a
+DIST genpatches-4.14-31.extras.tar.xz 17492 BLAKE2B 4a1d976f56d48c8da2c43cd306506075f226a50caa1730bc77cbbb11f11e9c7446ac471355f236535bf4878ecb9b9f4dbc9f07cb54ba9fb4089faee9d6b87ee2 SHA512 8d209e3ac993fce94ebeca0ec30f81710da0a8a9b657ca936f5d0db05061aaeb95cde4f552fe414edf51be8e28e6bb9af3cb668210a7c335b3f58cee84110470
 DIST genpatches-4.15-1.base.tar.xz 5908 BLAKE2B 6627ff7c5bd6b799dae5e61b1638ccc538715cc253521fd07faa0c5ea7dc9aed5204c040742d37a9d172509577ae5442526d11cbe8714540ee8e1f1637d0fbbc SHA512 c7b8cb613f4a2e6570808d179be6972511ea45c849c4415509e38e1d4688014cab15486628bb282178f306ff786e83718fb2171d1391057bb817ed67a0508caf
 DIST genpatches-4.15-1.experimental.tar.xz 5184 BLAKE2B 814356256c11ea5bb67706f47ed76d6fe6f8b4232b989ca042509ed2a7f3088f55bd113d3cac25342a66e4803f90864cca803c91661af106141b78ac9cf5fe18 SHA512 e840928a463a764d59013424045f64c1fdc8e5d18cf1d20c9ea15388d5f4c4b9ec6aa86e88c33add716366d6b18be175943c22b6bb1c88d3cdbaebb606a38b10
 DIST genpatches-4.15-1.extras.tar.xz 17492 BLAKE2B 1242891d2ebe519d6c9d43eb6a0b2e9dd1c51ae76dc8aaf71f14dfbf3b9c52097cfc4ad59c5e2add1da4ded0a34a06e2d302a0366a8afb665f1536f899fa3f9d SHA512 21830b23a1b16291beba81ac122a36e8bcf9268b548aa6e9258f18283e80f610ed249ccf320f27b0a45acd35e3bd8ba5ceb0420e360ae94635121f89d74903b6
 DIST genpatches-4.15-11.base.tar.xz 246088 BLAKE2B 12a2d77897901756c4012455b6458545568f9a8886c080820e5b2197cb518db8ffc2812b52cb0bb4255b2f96df8755d4af34c9068a90a9973ea25a3d98f3c7df SHA512 73e5abaa69702e943bdf77faae7665ed8582eb4b8e32d1b644fa4e1e6b985c0fccd026f637ad1f10afd4335b1cea359154e96c6abf4ca1e746ae27cef5aa67a4
 DIST genpatches-4.15-11.experimental.tar.xz 5184 BLAKE2B 4a44f3d3fef089140e6420c26d1c4102d518ce615abc30afb8127ede4328c276e3380502c2b28d5f452d8c7881130f0d2d7b04f0f81ce44f02db7b280493a12c SHA512 ddf304f14c9c714c32423b349c8740bd0785c5893ea7cfcf89895f0b76214693dff142c7fa5c40df09f55696b845210e3be8bda4fbf7deacff1718a83f83047a
 DIST genpatches-4.15-11.extras.tar.xz 17484 BLAKE2B 919091a255d5ec058e52c151caad2afe470b401a9ab5269946a2309ddee3a2b5068df8483807ee310832c690bb561700363a2b1c0294a4e15ca03dff36061890 SHA512 3a426bf63ffe786984cc8b9c296b0393fcaa9881c65d4220cadb331fe445fc05418a629cd5494f0a1419215d4512679d9619c8a92f4a10b2ad8087fa44292ffb
+DIST genpatches-4.15-12.base.tar.xz 251412 BLAKE2B c6534458a28c9df29b7cb9e3392000f49d529b2d223c8aee353b8e5e961886c97acb80993e30671ae2359a7f1ae6fb37ca1320571cad55b7cae562a03ae49f61 SHA512 f98e32b0b84b3499227a3ddca06398a1bad277e68b721b70a3cfdbbe9449c259a9e8ebc63e5463e65b5e5accbc6b3935bcc78840e26567a4c12e29a19dc8e422
+DIST genpatches-4.15-12.experimental.tar.xz 5184 BLAKE2B 4a44f3d3fef089140e6420c26d1c4102d518ce615abc30afb8127ede4328c276e3380502c2b28d5f452d8c7881130f0d2d7b04f0f81ce44f02db7b280493a12c SHA512 ddf304f14c9c714c32423b349c8740bd0785c5893ea7cfcf89895f0b76214693dff142c7fa5c40df09f55696b845210e3be8bda4fbf7deacff1718a83f83047a
+DIST genpatches-4.15-12.extras.tar.xz 17484 BLAKE2B 919091a255d5ec058e52c151caad2afe470b401a9ab5269946a2309ddee3a2b5068df8483807ee310832c690bb561700363a2b1c0294a4e15ca03dff36061890 SHA512 3a426bf63ffe786984cc8b9c296b0393fcaa9881c65d4220cadb331fe445fc05418a629cd5494f0a1419215d4512679d9619c8a92f4a10b2ad8087fa44292ffb
 DIST genpatches-4.15-2.base.tar.xz 22348 BLAKE2B a4d4e0b6a83e46a657ced903845dc7adcdb749e6657006c58d7070a0cb906066a1241ba7c33c9431aab4af12debc0e875822c5d327dc29853420cc5699cfae2e SHA512 2d6d8a2cda9ee4c41068c03f1e90e5bec2c25debb2bfbda7d6acc83b49b4ecfe861fd0be68c133dac4c98f23d8c23fca816f817653cb283405148985f20c4e9e
 DIST genpatches-4.15-2.experimental.tar.xz 5184 BLAKE2B 4967ea59aaf9587c5f36e1cb97e0ce454f7d23c0d9e02cacf4bffef14834ca591eb4b64606fdc267d2051cab21ac49cfab16082d1a0affa2e2e555bfda27a72c SHA512 9fbf5806636b2676144dfce4d33c8ff1d97dba9a44703abe5cbc1741c3f54f082416f9628f308a186dfef1c82b42183a9a52970f96be06c1e0a60ae1a1a29257
 DIST genpatches-4.15-2.extras.tar.xz 17488 BLAKE2B 7549c1059b8aa48dedf196fbf53be363735ee2d016ce03fc22c3c72082eb5c770d5af557c8602ad01e7b98f1eeaa4c0497a6eebf344596365811f402307b3f6d SHA512 053490dac39816e14086781c4aa7a6c66544543a8851fd672b8a8cfcf49a03573e3820284de3a28c0345eec27a1c1687bc445443c5076ae3662686da3ed5e1d5
@@ -133,6 +139,9 @@ DIST genpatches-4.4-123.extras.tar.xz 16456 BLAKE2B 0d632f2f45a8b5a9b14182e160a8
 DIST genpatches-4.4-124.base.tar.xz 1872564 BLAKE2B d756fd483da71da0f0a032e8aacd06b789d7ba6fd9f20e87e3c1106f71b02d3ebea2dbd7d2bdf657806a2b3a9b1e638dd61f19854bc2a0a5fe7e5d9a7dbb0fe7 SHA512 fb6ecadb7ed520cb5f35af035311142a370a9d30c9df6a4b25cd51b48ea33c0727f58567c19927a0b3df09083fe816702fd394d531100c56f5e75a9d1e535e35
 DIST genpatches-4.4-124.experimental.tar.xz 87764 BLAKE2B 1949627cb676c0f92f91536c7325a8d38b8f3659cfefb55f8902de9d0d1e15f0b3c0628b9be1bbbe335d4ef373c62fa945f426674fcee76b3648e9898aa13f3b SHA512 16b58c86b5fe8fdfb3ffba969c19ec5fda52c54369d7c5a700b5f14ce5eca6f866772f9f2346bbebe98039baf1dde11ac42ef665bfe53b42cbcd984ebafa6e25
 DIST genpatches-4.4-124.extras.tar.xz 16460 BLAKE2B 2455cb186ced99e1b262940c040d80235f87247641a61be4f6e7707089ee22b85e18cdbbecb637d73275081658d83cd057be5e7b4dd68b2b481e4d2be79535fb SHA512 1978d8f290b537fab536033394cfcca264135367523bc0abc6d7307fa43322a37b260dd8d2bbb091795d071d62b1dbd59af5dd1c7880e06b74e1d96a9f0c6119
+DIST genpatches-4.4-125.base.tar.xz 1879352 BLAKE2B 7f4c8d179da7d9e5683b93e13567fc7031db2210224e7428e4d30f4b5f9ed7effe9ad5667f83d8bf382b779b01ee72128e9b94822f878a386339b12f00283ab6 SHA512 4f6a38efb93dcd72bf3bb03d57f25738578cf7f62bb5601411921674272d450735cde02d882f745bba673cbe12a41507ae0e4ecbce3b5508b4d79ef5161fc0c6
+DIST genpatches-4.4-125.experimental.tar.xz 87776 BLAKE2B 39a03c7d473597e9023be1eac1a1f03a942057dadaea249e145aabc33e0a7775aeaccf9447ac797d95d70ccb52660eb45eacdde49d33fa6abf84fc0afeecb7b2 SHA512 408959068c465033f9a1246a6d1ffdd60c919ef964c8c92b7f7de6b0f5c465310e194781f068a840410d948a6f3ad6420b44f47cd2081566becd88a57ef7b1c8
+DIST genpatches-4.4-125.extras.tar.xz 16464 BLAKE2B 17b725189a9c68d87b9500e50b3b050d241ad7a5f8176b55e47064a408db1d826ddbce116f2b2d2c3ad084756c02f27ae1413cea3843b38f2ef08b2f49398c0b SHA512 6ba26936f053c687a69d5ebd27bf1b73c44103874f3c6bf9266deae23db6f602adbf4db0eb127e0e4247889e14270c48d9fc71edfbce19b9e6060085a8f88b8e
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -202,6 +211,9 @@ DIST genpatches-4.9-88.extras.tar.xz 17360 BLAKE2B 00e0aeb808a94997964f266f4518b
 DIST genpatches-4.9-89.base.tar.xz 1646644 BLAKE2B fe6f25fa225bdf40147cad94805cbaa816f3e6d18cac674716c5b47f42e8125b00c421ada6876ede3cabe598903d70b70d7cd966ea08fecddf3f05812d52edd6 SHA512 ea6d1d81cdf91a94660cad88606970429dbcd1635a6f77b17fe2033edba4827c22212461f9e681b3a88e0f32020bfdd94c72d43aa04b31d81fc70e2d91c5ead9
 DIST genpatches-4.9-89.experimental.tar.xz 106376 BLAKE2B 46bc3138012006fa09724def4a4d64ac74c782a9eb101a741f9b8c429f35ada95b3c9bd704cc48f7a839e22d40dc8b0293ed497421754f5cd900951741745403 SHA512 44b107ea8f8f58444bfff322adabcff2526c8e4455193b00357e43ee3d4b4a88e7df9c40bede32b3742672617919f98098b2603d3a60f69fb484558283fb02b6
 DIST genpatches-4.9-89.extras.tar.xz 17352 BLAKE2B 492b2c9d3b5865b15e6be00e419d7c656be507ca65cf7943da3fc0f6076d4f70d062a9e2a31403d5e6486c9fa73326dc8de522887d581ba017b6284e5dbc1981 SHA512 cec57e60b99d80066a1c9a120f680b6edd33736417491bf3181b824725df50c1a1252ae1a339d32a38f18d38bcd04264ff9f70bea9093c814e3f5809e7c8eafd
+DIST genpatches-4.9-90.base.tar.xz 1660088 BLAKE2B f8149c631938301b133ec97ac2ce6342c4eec8214b362a775fc6adb4f5d7baf67ff07bb94a6de4089deecdd57dbedc47a7ba94be2d02d2ef943f6ce44fa46a6c SHA512 720b45fed5d5f8374947789495086115bca9d0459ea3af7455555da567000a3de02562b9566f571b0251baab3cadda36372dad1357d7d8a198cd5bd95a304f56
+DIST genpatches-4.9-90.experimental.tar.xz 106404 BLAKE2B cdb2003891ad215d84c770638ab21f1ab343ec594744f3b69a129318b7766e88452dd98bdfc9d9d716f4b1301c861354da6b4fcb9ce70f22a72cdd0769fc5281 SHA512 ab83178e9fac2ad3118ce7d08c37024f7452a113bcc98b783d038e4b31cc1773e93ff3e9d730a62ffd22db5a6c3ce9708d63acf55ea4fbc61ddccb5e70731248
+DIST genpatches-4.9-90.extras.tar.xz 17356 BLAKE2B f55389b1a34c0cc5e90d534130dfd502117edcc43e1d00e2a359f173fa7be613dd8bafe6d9922ea22652fe43e40803d86e9f103df6453a32a0e2862d3c546792 SHA512 04b6ef6224bf37e908efbc6ac2a6b12f20306b69ea87380da6a5858752c4409e49ae07cb334ebe18ecbc2ad46a9e1f7b480b2ca07f7ba5fdae5f4a99b7562996
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.26.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.26.ebuild
new file mode 100644
index 000000000000..17f59ab010f9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.26.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="31"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.15.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.15.9.ebuild
new file mode 100644
index 000000000000..5c9caf450f21
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.15.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="12"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.121.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.121.ebuild
new file mode 100644
index 000000000000..41f3cd9ea7e0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.121.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="125"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.87.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.87.ebuild
new file mode 100644
index 000000000000..967267b558b1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.87.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="90"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index a5dacdc2739c..5d1f50d356dc 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -3,3 +3,4 @@ DIST patch-4.16-rc1.patch 165143143 BLAKE2B 9c373b51ffb514eca21c01dad33d2b236ca0
 DIST patch-4.16-rc2.patch 165456194 BLAKE2B c62bd783fda3305d455d8b40d27dee82bee3d6cc6ec4eb58c82e78094c3813bc37677fe69c6843464d939a21502abbc42d5f370b68b9c5ea22d09a37eedb498a SHA512 36af7d64f4ab716b8ab1d21e77e0f4d78d2fb06d3792dac62d998b3889c9d25231182919142be2309fca96963631a815da748ff24e21faf706c37429a2acb7a4
 DIST patch-4.16-rc3.patch 165801482 BLAKE2B 2c4c113a45b08ca742feea938e0ff90e473a94475808e9a51a281650c059bb60caa8666bae24aa97f6aff8573cc663912c2e29f9b0ad3fc0fcf508b8a29f9536 SHA512 b5b4bc53a245725806d7f46d53e5715e8b8505536c96465cd8ea9dc506ed7b1c02a518114c3025786d10ab72c1454c03e85380bddd753f48946ca71bc0ed6f17
 DIST patch-4.16-rc4.patch 166128228 BLAKE2B 739531176f5f171bfde598076de48645f53ad7d7cadef65a0193b45bb0967f7435c71de7a1ebdac97172dae4e992ee90dee90f84c945a2e2eccbbcbaeed6f0cb SHA512 94e0f940a9d75c80f1ebd99dacc5ebf4774d341f3ed2819ffc8f9019505af695d8e516a16124af27be005d02c12b0f8c622b159c2726d4f10a8ebd114e33c447
+DIST patch-4.16-rc5.patch 166483601 BLAKE2B 666b3a7faa31ca471f1a23806f09ed4076bb3d5e2c006a5c599d0f3c2577daf05b025afec57e35d8f09498d31befbb7d8267f3d8e154427e47ff0c0f65130921 SHA512 6cc28aed7abfbe91faba7981b9b93718b684954f394aba8ccc9cdde0c097fb4f5acf2bcf4bbf7eae102e5abdd4d0d1c154580344e1b015f794db564396a86e2a
diff --git a/sys-kernel/git-sources/git-sources-4.16_rc5.ebuild b/sys-kernel/git-sources/git-sources-4.16_rc5.ebuild
new file mode 100644
index 000000000000..de404a4af084
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.16_rc5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.15"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.4.8-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.4.8-r1.ebuild
index aa46fa523f42..1ea87abbf725 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.4.8-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ UNIPATCH_EXCLUDE="
 	2900_dev-root-proc-mount-fix.patch"
 
 DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.7.10.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.7.10.ebuild
index a2206f87fb50..466eb9b51e5c 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.7.10.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.7.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ UNIPATCH_EXCLUDE="
 	2900_dev-root-proc-mount-fix.patch"
 
 DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.7.6.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.7.6.ebuild
index 2690eb498f83..5d8c3edb560f 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.7.6.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ UNIPATCH_EXCLUDE="
 	2900_dev-root-proc-mount-fix.patch"
 
 DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.8.17-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.8.17-r2.ebuild
index 2e1fc3d60d2b..5d34dcc83863 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.8.17-r2.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.8.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ UNIPATCH_EXCLUDE="
 	2900_dev-root-proc-mount-fix.patch"
 
 DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.9.21.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.9.21.ebuild
index 4f0d2909493a..4193a24885a3 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.9.21.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.9.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ UNIPATCH_EXCLUDE="
 	2900_dev-root-proc-mount-fix.patch"
 
 DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.9.22.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.9.22.ebuild
index 0cbe2619d285..61595d9fda9e 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.9.22.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.9.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ UNIPATCH_EXCLUDE="
 	2900_dev-root-proc-mount-fix.patch"
 
 DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.9.23.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.9.23.ebuild
index 0cbe2619d285..61595d9fda9e 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.9.23.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.9.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ UNIPATCH_EXCLUDE="
 	2900_dev-root-proc-mount-fix.patch"
 
 DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.9.24.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.9.24.ebuild
index 6772ebb6fc60..a4ff53794f86 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.9.24.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.9.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ UNIPATCH_EXCLUDE="
 	2900_dev-root-proc-mount-fix.patch"
 
 DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 80b1f5d6b1e4..b6418560a2f8 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -8,7 +8,7 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST patch-3.16.55.xz 1935212 BLAKE2B 0f954866032b5486e2b0cb1d043323b2604638538bb15e56293244473ac15fcd5a65d0c0bc96a78aab2dc5ee3e79e9043fe16519b096595c3156cb677082372f SHA512 a80745b271cbb2dbcee3f696a73238fcef3fefc8bcb4b49f4c1de234cbd78f6b75995b48c13b2687e8bbffad3c14114a036bdafdd68c535d5691fbe45a4c899f
 DIST patch-3.2.100.xz 1910332 BLAKE2B 16ff861ced5a622e424798bb2df220636c3f930913a7d6af28042be68ec50010b615a9779b6ecc9216c5b866a8e05e33dc1af2f872504f485add430abcbe2d26 SHA512 cb78568ce2da2322b90033a9ac6ad55ddb5c8b72031f2f1b4d178a5f3c2b82c915faf35b9a99669f5e794a07e639a9b838b14550cfec4679b88d979d99caba0d
 DIST patch-4.1.50.xz 1442376 BLAKE2B ed2f792b8cfa815d75725d115c48734107ba5bad749f10e916caaacd208e16224dfc3c538f91856397ec4edb66a8f75a80e8f4c9f3df03b2c86ddf9038810df0 SHA512 bdb52743f06aae307f1d475c42f8c75f483f246b8f2f4edb406dadee43920aa21576fca400a42d35c677a54837217578fd8aaaa07e970f84e6d4cfb481fb11ab
-DIST patch-4.14.25.xz 776144 BLAKE2B cfb697e473b2ed245fc6a0b23f2e828ce5ea9219e6114843882ca3599b5e420c16c17b1da94580b728dc37d18d443bcba11c177e0771c0c5993758b03d31a224 SHA512 d15875cd3063c6bac5f8e94ba8dd7349b138241c67912ed0723b728a5f302ac9213729171b98664871d14b38670c7868ff64b8f45d0488fe26528935a641b678
-DIST patch-4.15.8.xz 236596 BLAKE2B 4bf6c3d576b8eec30133a2ba90115329ed9b5d5f9da9cf4589084681080d60637c725e48c3ff99a00a1c3aaffb800a7c7b5b3e69a40a72f9a24dcd5522a0b0d0 SHA512 0e070a05b2caccfa8dc41ae0c826b50cf6e9e02894213972745f609e5cda9aeb04c6ebf480d34c12bb649ad0f4b8a07b3c67e562ce1cae7a086d1e30da280458
-DIST patch-4.4.120.xz 1718956 BLAKE2B 06df2a0f9ce7ec7d813e6101a5fe5704adf6303c516193d8f53f5f3486a4f9b16c3842797ffa99d9e8daa5f3c1b20366ef2971c8f22aed1de443f4958946de6c SHA512 dd879f449840f380287bda06fe27453768b65493edee8f162cf17d3268f838acbbea375633412f1c0f8bc24b41fe153d610cbbca205cd7c8891bfe8f398f3ec2
-DIST patch-4.9.86.xz 1530748 BLAKE2B f23d5321758057fd0d2e08f8326c83392dac2714f87b917c4a56ca12619da2fe5c963e8802f0886aa4db337a79e4003313861f95ad4f77538406870182e8325e SHA512 64db94862faa4217ce0d815f6cb7274c9ee0c45703cec1374eea08e657bd8a3d7db88ea9435939c49f22a2d4fd9a773b052401f97d5ebb55e116f99f7520476f
+DIST patch-4.14.26.xz 779840 BLAKE2B 82a19d0e24b02b8aacec7162e0067a714a4be2c6652774ea104be7bb7624a9cf1ab60d7611078cc1a1244d1d2522246987be0f423274a275dad788eba1e3d1eb SHA512 9659875861cf2fbc04e8f21343d7a29ddbabdaf230f6061fce816677d7ffbb297ab57eba5a47b8415c2c110260b8085b9b168aacd7741addb3ebdb1db2f9e44e
+DIST patch-4.15.9.xz 241684 BLAKE2B a27767d3d735795b705d243eacb73304bf08e9d66360f9f93f2553333b321f0a253d232e3189cc439d522b5ab92fb446f47104bfd24da7f483bce9fa796c3cfd SHA512 60d24d79c19ab44520e4b583c74ca30045dc72bebd426a802c84d62c369fbda5bd7016aee1f5fa3931937cd31f17d6c0867080eb26949dedbd2d9522ee13143d
+DIST patch-4.4.121.xz 1724108 BLAKE2B 5e608b1f1959360edc84251be9c5145c6261cb8345cccdd73bd0a1f7424546864ddf03a486435fc3567f28a3661686738706dceb5a633734511e4ecda3fd5b42 SHA512 05d73331f8f0f2046a86dcd5b752e7ac3c76fcba375a1356cfa0d0bda6dd0c12d94bbc02a79d67557c188f5850d4bae5d716ecff33b5aaf0ccac0510de03413d
+DIST patch-4.9.87.xz 1541476 BLAKE2B 4b0efdee81b5bd6768ff694681a6265904a6b915c337bbd2f7794c9d14995c81e9d3099812a89d7f89f1c47a749e8b9906537c598e92c8ca9135eaf1452af603 SHA512 d8f06a39716b675398074acea0b577035443e4cc50cbe3a89caf79793770ead2919bfce38ce38284e5ca0b451dd7524c492e3e7d125bf914367978e4cff60d38
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.25.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.26.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.25.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.26.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.15.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.15.9.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.15.8.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.15.9.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.120.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.121.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.4.120.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.121.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.86.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.87.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.86.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.9.87.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 2c6538ad9b74..a952b5808b0f 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
index 6055414b29dc..c2d9e4b58638 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild
index 3e2c58532f58..145553565216 100644
--- a/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/libcxx/libcxx-6.0.0.ebuild b/sys-libs/libcxx/libcxx-6.0.0.ebuild
index 0948ab0c6825..284a0aa9eb51 100644
--- a/sys-libs/libcxx/libcxx-6.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
 IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
 	?? ( libcxxabi libcxxrt )"
diff --git a/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild
index a341b98885b9..19a29e9bd26e 100644
--- a/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
 IUSE="+libunwind +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index f0f48a7dd551..df6be90d3ee6 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -1,4 +1,2 @@
-DIST libcxxrt-0.0_p20140322.tar.xz 58208 BLAKE2B 429740f2ea0e9d3fdc2631ae1c4d6e458b7c3f94d892721f74ddd4935f9fb982f6d178ea00eb5d3548088b5d2052fa35cb671689f670c23e4a843efa9232437f SHA512 8cc2f3779a28b8eb215c3dc97e1382651016127ec6b1feb5067de435841c20e6338662172176f003242f1393b8df3ecf91eaa85b54281e1c588dab44d01ca930
-DIST libcxxrt-0.0_p20150423.tar.xz 58596 BLAKE2B 80a0a91aa94ea3ad736a9832eb574c2481bf0c9120fac6a8872d60dd51b56e9a6b9013bc0c975c1fcf449d2f2652a952a7dfa16157bd6ec16342a5d0da8dc80e SHA512 67a3b9204cee7b7900228483b8e24898d83f76b3ff2ed94bbbd67ca3fba623021e1b346c91ef46955da78f2e001395dc84a2f496223b52a0e59e97ff2e27e247
-DIST libcxxrt-0.0_p20160922.tar.xz 60460 BLAKE2B a6ae2f76c2557049f85697928b5d8654e9a82057d431c33b4762856be85721c65b5c92e377ac9c92dbb5ca9ef723dc2f874ece29997bdcb685b1351dea1d7e1f SHA512 3ec60ef2127a7e51793f90291ef61c6853d9a7b23201617f9dde0d27d987901db5ad0b142e3adb3eee64884e11793676912f2fb8e8b090d35288277a54d261bd
 DIST libcxxrt-0.0_p20170515.tar.xz 60488 BLAKE2B ae605dbd85a619886a3dca4ded06529bf51309d2c12028aaa4d27180efcbb6a6cd40e59fe731511cc920ba1e3c5786a5051a560186923d60c9aa7eae34b1679e SHA512 cf0539ca8f836adadf83195784ad008008faea2b0dd8953191fa1012d542f10f546eb58ecc42fa8e864c1113530a6bceb28a8005aa62276570343a3aaba09266
+DIST libcxxrt-0.0_p20180311.tar.xz 60920 BLAKE2B c75bf5bb88e0f5c448a377a7ae58b33444e644c5e4ce7d6e0f5242c4ee61335be6a8b878bcc06f47bb44f9c48895845b174ca398c95aabb90182ebefd3d31815 SHA512 625aa0fab7d54c584faf4cf1e7f8f694776337fc0c6f441683f035743d00e3d18be3339a8ccfc8b61eb07819e4ccf7b1e5f3e7948fd584eefc5d61b200b32d50
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20140322.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20140322.ebuild
deleted file mode 100644
index 6448b81aa37f..000000000000
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20140322.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/pathscale/libcxxrt.git"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
-
-inherit flag-o-matic toolchain-funcs portability ${SCM} multilib-minimal
-
-DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD"
-HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	DEPEND="app-arch/xz-utils"
-else
-	SRC_URI=""
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="libunwind static-libs"
-
-RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	${DEPEND}"
-
-DOCS=( AUTHORS COPYRIGHT README )
-
-src_prepare() {
-	cp "${FILESDIR}/Makefile" src/ || die
-	cp "${FILESDIR}/Makefile.test" test/Makefile || die
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	# Notes: we build -nodefaultlibs to avoid linking to gcc libs.
-	# libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc.
-	tc-export CC CXX AR
-	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-	cd "${BUILD_DIR}/src"
-	LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared
-	use static-libs && emake static
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test"
-	LD_LIBRARY_PATH="${BUILD_DIR}/src:${LD_LIBRARY_PATH}" \
-		LIBS="-L${BUILD_DIR}/src -lcxxrt -l$(usex libunwind unwind gcc_s) -lc" \
-		emake check
-}
-
-multilib_src_install() {
-	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
-	# it. FreeBSD head installs it in /lib
-	dolib.so src/${PN}.so*
-	use static-libs && dolib.a src/${PN}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	insinto /usr/include/libcxxrt/
-	doins src/cxxabi.h src/unwind*.h
-}
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20160922.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20160922.ebuild
deleted file mode 100644
index da8a1e692772..000000000000
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20160922.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/pathscale/libcxxrt.git"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
-
-inherit flag-o-matic toolchain-funcs portability ${SCM} multilib-minimal
-
-DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD"
-HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	DEPEND="app-arch/xz-utils"
-else
-	SRC_URI=""
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-IUSE="libunwind +static-libs"
-
-RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
-DEPEND="${RDEPEND}
-	${DEPEND}"
-
-DOCS=( AUTHORS COPYRIGHT README )
-
-src_prepare() {
-	cp "${FILESDIR}/Makefile" src/ || die
-	cp "${FILESDIR}/Makefile.test" test/Makefile || die
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	# Notes: we build -nodefaultlibs to avoid linking to gcc libs.
-	# libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc.
-	tc-export CC CXX AR
-	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-	cd "${BUILD_DIR}/src"
-	LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared
-	use static-libs && emake static
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test"
-	LD_LIBRARY_PATH="${BUILD_DIR}/src:${LD_LIBRARY_PATH}" \
-		LIBS="-L${BUILD_DIR}/src -lcxxrt -l$(usex libunwind unwind gcc_s) -lc" \
-		emake check
-}
-
-multilib_src_install() {
-	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
-	# it. FreeBSD head installs it in /lib
-	dolib.so src/${PN}.so*
-	use static-libs && dolib.a src/${PN}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	insinto /usr/include/libcxxrt/
-	doins src/cxxabi.h src/unwind*.h
-}
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
similarity index 78%
rename from sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild
rename to sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
index 0b5466ce563d..0c117aac6bbe 100644
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,19 +21,35 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
 	KEYWORDS=""
 fi
-IUSE="libunwind +static-libs"
+IUSE="+libunwind +static-libs"
 
 RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
+		sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
 DEPEND="${RDEPEND}
 	${DEPEND}"
 
 DOCS=( AUTHORS COPYRIGHT README )
 
+gcc_check() {
+	if tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]] && use test; then
+		eerror "At least gcc-6 is required to run tests. Please switch to a newer"
+		eerror "compiler before proceeding."
+		die "gcc-6 required for tests"
+	fi
+}
+
+pkg_pretend() {
+	gcc_check
+}
+
+pkg_setup() {
+	gcc_check
+}
+
 src_prepare() {
 	cp "${FILESDIR}/Makefile" src/ || die
 	cp "${FILESDIR}/Makefile.test" test/Makefile || die
diff --git a/sys-libs/libomp/libomp-6.0.0.ebuild b/sys-libs/libomp/libomp-6.0.0.ebuild
index ebe51c4b496b..dc670c92964c 100644
--- a/sys-libs/libomp/libomp-6.0.0.ebuild
+++ b/sys-libs/libomp/libomp-6.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
index db6bc3cacf89..fcc113a63c9c 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 52e66d5da336..24148f9304ab 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/acpid/metadata.xml b/sys-power/acpid/metadata.xml
index 9f5b0250f67d..ab0b82310d0f 100644
--- a/sys-power/acpid/metadata.xml
+++ b/sys-power/acpid/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">acpid2</remote-id>
 	</upstream>
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 622fd182f139..33d49eebda0a 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index 06e09ce2f16c..a001516358ad 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -1,2 +1,3 @@
 DIST time-1.7.2.tar.gz 108371 BLAKE2B 17d83faa24974fdd5853d83b0524a9f97780db19c42e9633d14acf39653b581a511856ec3be67661796fb1aee1d7b1bdca9fff3f5e88abd9f22c1736a02a04dc SHA512 dfde8f48a9d52bcc9080596feca6c429556e1e510977503138195d390cb52f27dd171f519d78226b0b48adc404062ec1f9234d92ea9707ec16d1be23ced90afc
 DIST time-1.7.tar.gz 103066 BLAKE2B 900df9031f90fbdab5b778c8ec61b3fe5efb2cb6a21834a31e3eefe845e05977b7c3206579e0bd7959f4dd5a34a909b16cc96f743aaf81cc1edb182a5669c68c SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1
+DIST time-1.9.tar.gz 596779 BLAKE2B b48c2def2f7aaa79ddb8838ed9e103dd7b1b573b6084d1481838cac86eb7930b3a231469936ad23d5096e576ea728e821defb27fc8b3f9187809e3f5c01b7c57 SHA512 5c6dabbbe71e9103a47b892b86bb914c1704122d4fe7dff1e2cbd28503297163118d295077d8e062b035d673a1f91c36f8a45c7383f374fd766942b32bde4406
diff --git a/sys-process/time/time-1.9.ebuild b/sys-process/time/time-1.9.ebuild
new file mode 100644
index 000000000000..60bee01e9b3f
--- /dev/null
+++ b/sys-process/time/time-1.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Displays info about resources used by a program"
+HOMEPAGE="https://www.gnu.org/directory/time.html"
+SRC_URI="http://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="sys-apps/texinfo"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 404e80345983..2b8e448fb892 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/python-pathlib/python-pathlib-1.0.ebuild b/virtual/python-pathlib/python-pathlib-1.0.ebuild
index a4fc11ec14a1..8d68b5a625f8 100644
--- a/virtual/python-pathlib/python-pathlib-1.0.ebuild
+++ b/virtual/python-pathlib/python-pathlib-1.0.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
 
 DESCRIPTION="A virtual for Python pathlib module"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ia64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ia64 ~ppc ppc64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 0539843a7690..2b8cc67db6b7 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 0885f5675fcc..3012b7eae9fa 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,3 +1,4 @@
-DIST kibana-5.6.6-linux-x86_64.tar.gz 52322049 BLAKE2B 7c1b36b2231fe6b48977459475aa40badd255391b57dfe32294096514a08335267b7276c17744010dd66ad1497ba80358cc45e0862811c28c0229e0eacfa82e8 SHA512 75803ff81cb73a48e2071f6249ec90b863246ce04b668919f811e43b27614ccb571f220e4667fc0b505ed45f531d8487aed615752752889d498a2f77e06b2f28
+DIST kibana-5.6.8-linux-x86_64.tar.gz 51974963 BLAKE2B d90b3e56e9d19c3846b7fae294d8bf27b89ffe462d8554e465bb5235741915ee65c1c6e58b94453ffbb80eaac17ede190300d614b25cf033d84231d87a46c6e9 SHA512 a819fc1166994364e94a47fa6f55f06e0672a6c5fc9bc8d594ad5ba48092033faafcc8fc70aae3c4b04300f96a9221683711bc2e2b5d343fd85d7dc22b173513
 DIST kibana-6.0.1-linux-x86_64.tar.gz 62720465 BLAKE2B 81c3cb130067483cc6138c5274555c01102e365d873bf753a534cbcd96487516af41fbb91878cea4f80ffc02c5d18c82d322b0530cf1d3a55adffeefe60d9574 SHA512 3761f8abff5d949631f365c228af2f205597e1f05137d0140917b35128d2dcb79e32db355873864c1f01bce06121af71f1bfcb1679ae25903e1121bc76f68ecc
 DIST kibana-6.1.2-linux-x86_64.tar.gz 65093343 BLAKE2B 08254af4fcc261a49f5f6e4e1c734acca799708394d95d3203d6355d1e9dc3fa6bfa3eb85b1cb40e5d52a4558b6ea202d54e87ff6274823767f8332a7b01b9c7 SHA512 eefe3ae73e08c0cd14c5c7d7f962dc78cdfff1096895a1ab539f172b84dfa0d8c197d99573ac7dea6c60adb89b5e3fd5be10dddd749c060c540b30c34426c8a1
+DIST kibana-6.2.2-linux-x86_64.tar.gz 83415765 BLAKE2B 86f7511c82b6954a8769673b856eb46f2b633490535a013d4e30138e8abee470776493de43284f2e68b2cac6b74ba2b76245fd35803b8b5834f79ea5f488dd6b SHA512 8d26eb8293028aa0c35942a7b5025401f9b717d5c548d6cdbcf2761c0d8cc1189fdbf12c6f39468d4c809a3975f5f3c817e0f02424b296ce36183e118b0c72c6
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.6.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.8.ebuild
similarity index 100%
rename from www-apps/kibana-bin/kibana-bin-5.6.6.ebuild
rename to www-apps/kibana-bin/kibana-bin-5.6.8.ebuild
diff --git a/www-apps/kibana-bin/kibana-bin-6.2.2.ebuild b/www-apps/kibana-bin/kibana-bin-6.2.2.ebuild
new file mode 100644
index 000000000000..8471d3d0b369
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.2.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user eapi7-ver
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="net-libs/nodejs"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+	default
+
+	# remove bundled nodejs
+	rm -rv node || die
+}
+
+src_install() {
+	keepdir /var/log/${MY_PN}
+
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -rv config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
+}
+
+pkg_postinst() {
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2)"
+	elog
+	elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
+	elog "in /etc/conf.d/${MY_PN}."
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index e7199acf5900..0e1ce75f944e 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 39095e359bf5..aa73ebc07f56 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,4 +1,3 @@
-DIST chromium-64.0.3282.167.tar.xz 482246360 BLAKE2B b4785c20f33081015ac31fed9dbd108dc78160d95c4ea7055b8fffdb714fe9ef120727cd6b88d4e4a15b0c429f04c7c512cca90c5313128e0001a4ae5b908b6f SHA512 1bee80d2e8d4332cfc307efdac8eb11a48e42f3927e63e7a9d5ff2bbad6c4534926669f21defbf0553160f5bb28596723be8bd0e3dfa19ca9a1e854bcf42fd77
-DIST chromium-64.0.3282.186.tar.xz 482247144 BLAKE2B b59c5afeeed33fe081f35d0ee228a0d67a97fc1370c7d3ab90304ea6e236ee0f7fecd2c36df0acbdf384f42e2f90926cbdd56e683afc95e78d4bdc64b6d24453 SHA512 a8a435ee8506cfefaaf2df7447010df5db69fa6907844872d00643f55723a9bd7771649658f5151c857ac037adcbc8bdf2a5375dd105f78d068277ef021af7d8
 DIST chromium-65.0.3325.146.tar.xz 570305180 BLAKE2B b4ac28ea267a673e0c8d22abb41b607ea7f1bca12b43f80f3fffd562bb85af5b298725beca2ac3e3a31297537c2d485912eda3996ab56c45bf8e113cc7ebf764 SHA512 e8227325c0128e6c476006aaba97db24b7458de56fb47a26c5880564b730d6e3c130945bfa1e8f664a270b8f22dc25869633d42860c2a9ac684e37325802fbf5
 DIST chromium-66.0.3355.0.tar.xz 582642152 BLAKE2B 16a89cc99984b566741770f9081a738596ac0b031e916073df417ac42406a96a8f874278720f3462fba827218dff141eddd614cf2ca494ec3d38577744e7c441 SHA512 324902e3e8ec7c22dbb95f2d8f97069dac97f702f528130c06eb7a246e495e51b069f4ce09a7ca875ff511e0bf992207b55b1f887aaa3a438179618c206df436
+DIST chromium-66.0.3359.22.tar.xz 583532916 BLAKE2B 94a09d7aa687697ec572a933fdf032ad27a77bed24a31c7a497222da86bbc44f0a25846c7a925c527d3f8ee601110eaf8cd8f4691a19170ca68098acbfd885be SHA512 7143e6e048d5b370032ab24f231b63fda0044f08c6f2c3f8722a33d43387629d7462434b7c3fea8bab8a4a1e25622d9576cd3eba80d23b8c937b85e61c6bc55f
diff --git a/www-client/chromium/chromium-64.0.3282.186.ebuild b/www-client/chromium/chromium-64.0.3282.186.ebuild
deleted file mode 100644
index a87d5daac9e1..000000000000
--- a/www-client/chromium/chromium-64.0.3282.186.ebuild
+++ /dev/null
@@ -1,679 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/atk
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-59:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.5.0:=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-# sys-apps/sandbox - https://crbug.com/586444
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-6.9.4
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-widevine-r1.patch"
-	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
-	"${FILESDIR}/chromium-webrtc-r0.patch"
-	"${FILESDIR}/chromium-memcpy-r0.patch"
-	"${FILESDIR}/chromium-cups-r0.patch"
-	"${FILESDIR}/chromium-clang-r2.patch"
-	"${FILESDIR}/chromium-angle-r0.patch"
-	"${FILESDIR}/chromium-ffmpeg-r0.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
-			# bugs: #535730, #525374, #518668, #600288, #627356
-			die "At least gcc 5.0 is required"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/polymer
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang-angle
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/openmax_dl
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/build
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/spirv-tools-angle
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/vulkan-validation-layers
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-bootstrap_gn() {
-	if tc-is-cross-compiler; then
-		local -x AR=${BUILD_AR}
-		local -x CC=${BUILD_CC}
-		local -x CXX=${BUILD_CXX}
-		local -x NM=${BUILD_NM}
-		local -x CFLAGS=${BUILD_CFLAGS}
-		local -x CXXFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	einfo "Building GN..."
-	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
-	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=false"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	bootstrap_gn
-
-	einfo "Configuring Chromium..."
-	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Work around circular dep issue
-	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
-	eninja -C out/Release gen/ui/accessibility/ax_enums.h
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	if use widevine; then
-		# These will be provided by chrome-binary-plugins
-		rm out/Release/libwidevinecdm*.so || die
-	fi
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-64.0.3282.167.ebuild b/www-client/chromium/chromium-66.0.3359.22.ebuild
similarity index 92%
rename from www-client/chromium/chromium-64.0.3282.167.ebuild
rename to www-client/chromium/chromium-66.0.3359.22.ebuild
index a87d5daac9e1..cf52ce6305d2 100644
--- a/www-client/chromium/chromium-64.0.3282.167.ebuild
+++ b/www-client/chromium/chromium-66.0.3359.22.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/fontconfig:=
 	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.5.0:=[icu(-)]
+	>=media-libs/harfbuzz-1.6.0:=[icu(-)]
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
@@ -101,6 +101,7 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
+	>=sys-devel/clang-5
 	virtual/pkgconfig
 	dev-vcs/git
 	$(python_gen_any_dep '
@@ -148,24 +149,26 @@ PATCHES=(
 	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
 	"${FILESDIR}/chromium-webrtc-r0.patch"
 	"${FILESDIR}/chromium-memcpy-r0.patch"
-	"${FILESDIR}/chromium-cups-r0.patch"
 	"${FILESDIR}/chromium-clang-r2.patch"
-	"${FILESDIR}/chromium-angle-r0.patch"
-	"${FILESDIR}/chromium-ffmpeg-r0.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-clang-r4.patch"
+	"${FILESDIR}/chromium-ffmpeg-r1.patch"
+	"${FILESDIR}/chromium-ffmpeg-clang.patch"
 )
 
 pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
-			# bugs: #535730, #525374, #518668, #600288, #627356
-			die "At least gcc 5.0 is required"
-		fi
-	fi
+	#if [[ ${MERGE_TYPE} != binary ]]; then
+	#	local -x CPP="$(tc-getCXX) -E"
+	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+	#		# bugs: #601654
+	#		die "At least clang 3.9.1 is required"
+	#	fi
+	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+	#		# bugs: #535730, #525374, #518668, #600288, #627356
+	#		die "At least gcc 5.0 is required"
+	#	fi
+	#fi
 
 	# Check build requirements, bug #541816 and bug #471810 .
 	CHECKREQS_MEMORY="3G"
@@ -210,6 +213,8 @@ src_prepare() {
 		base/third_party/valgrind
 		base/third_party/xdg_mime
 		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
 		chrome/third_party/mozilla_security_manager
 		courgette/third_party
 		net/third_party/mozilla_security_manager
@@ -222,6 +227,10 @@ src_prepare() {
 		third_party/angle/src/third_party/compiler
 		third_party/angle/src/third_party/libXNVCtrl
 		third_party/angle/src/third_party/trace_event
+		third_party/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-validation-layers
 		third_party/blink
 		third_party/boringssl
 		third_party/boringssl/src/third_party/fiat
@@ -263,6 +272,8 @@ src_prepare() {
 		third_party/leveldatabase
 		third_party/libXNVCtrl
 		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/x86inc
 		third_party/libjingle
 		third_party/libphonenumber
 		third_party/libsecret
@@ -271,13 +282,13 @@ src_prepare() {
 		third_party/libwebm
 		third_party/libxml/chromium
 		third_party/libyuv
+		third_party/llvm
 		third_party/lss
 		third_party/lzma_sdk
 		third_party/markupsafe
 		third_party/mesa
 		third_party/metrics_proto
 		third_party/modp_b64
-		third_party/mt19937ar
 		third_party/node
 		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
 		third_party/openmax_dl
@@ -285,18 +296,19 @@ src_prepare() {
 		third_party/pdfium
 		third_party/pdfium/third_party/agg23
 		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/build
 		third_party/pdfium/third_party/bigint
 		third_party/pdfium/third_party/freetype
 		third_party/pdfium/third_party/lcms
 		third_party/pdfium/third_party/libopenjpeg20
 		third_party/pdfium/third_party/libpng16
 		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
 		third_party/ply
 		third_party/polymer
 		third_party/protobuf
 		third_party/protobuf/third_party/six
 		third_party/qcms
+		third_party/s2cellid
 		third_party/sfntly
 		third_party/skia
 		third_party/skia/third_party/gif
@@ -308,6 +320,7 @@ src_prepare() {
 		third_party/swiftshader
 		third_party/swiftshader/third_party/llvm-subzero
 		third_party/swiftshader/third_party/subzero
+		third_party/unrar
 		third_party/usrsctp
 		third_party/vulkan
 		third_party/vulkan-validation-layers
@@ -319,6 +332,7 @@ src_prepare() {
 		third_party/zlib/google
 		url/third_party/mozilla
 		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
 		v8/third_party/inspector_protocol
 
 		# gyp -> gn leftovers
@@ -369,6 +383,33 @@ src_configure() {
 
 	local myconf_gn=""
 
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
 	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
 	myconf_gn+=" is_debug=false"
 
@@ -385,7 +426,7 @@ src_configure() {
 	myconf_gn+=" enable_nacl=false"
 
 	# Use system-provided libraries.
-	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_libsrtp (bug #459932).
 	# TODO: use_system_protobuf (bug #525560).
@@ -395,6 +436,8 @@ src_configure() {
 	# libevent: https://bugs.gentoo.org/593458
 	local gn_system_libraries=(
 		flac
+		fontconfig
+		freetype
 		# Need harfbuzz_from_pkgconfig target
 		#harfbuzz-ng
 		libdrm
@@ -427,7 +470,6 @@ src_configure() {
 	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
 	myconf_gn+=" enable_widevine=$(usex widevine true false)"
 	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=false"
 	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
 	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
 	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
@@ -436,12 +478,6 @@ src_configure() {
 
 	myconf_gn+=" fieldtrial_testing_like_official_build=true"
 
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
 	# Never use bundled gold binary. Disable gold linker flags for now.
 	# Do not use bundled clang.
 	# Trying to use gold results in linker crash.
@@ -506,22 +542,8 @@ src_configure() {
 		fi
 	fi
 
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
 	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+	#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
 
 	# Bug 491582.
 	export TMPDIR="${WORKDIR}/temp"
@@ -555,6 +577,8 @@ src_compile() {
 	# Calling this here supports resumption via FEATURES=keepwork
 	python_setup
 
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
 	# Build mksnapshot and pax-mark it.
 	local x
 	for x in mksnapshot v8_context_snapshot_generator; do
@@ -567,10 +591,6 @@ src_compile() {
 		fi
 	done
 
-	# Work around circular dep issue
-	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
-	eninja -C out/Release gen/ui/accessibility/ax_enums.h
-
 	# Even though ninja autodetects number of CPUs, we respect
 	# user's options, for debugging with -j 1 or any other reason.
 	eninja -C out/Release chrome chromedriver
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index b2e76282118b..83fe931da4a0 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_66.0.3359.22-1_amd64.deb 53240502 BLAKE2B 3abc0a3d0b717effe3af983852ef898c79afecb833e7b1b813363f9aae4d6d0690e46a28f1248f86a4f201a43933d434e1fb2f1b8bb33c25965dad3eca10e759 SHA512 e9c9686c8c2b984d5f419fec10b165a8cf324f4ec773291027f233a678945ac0e3756c46a956ed821c31e4a51bf578559e613a49e8753799b45a20924a199914
+DIST google-chrome-unstable_66.0.3359.26-1_amd64.deb 53206848 BLAKE2B bbec089ff647b50886fbe0fb0693fb169ecc4f6129e765a14a34c4013272396521f399448b675af3d5436c0179766ed4629630f2d3df272d7ee1f8e932230d15 SHA512 fad3a2cf5215d1c84bc4ad403903463afcf4072fd63aaeaa63ea0f2cf28347e827697c1ebe74b75759e3b72e1389a94443ab81424acfd542aca33caa8932ca66
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3359.22.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3359.26.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-66.0.3359.22.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-66.0.3359.26.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index fc78f6bb250a..6fc93e2b7b16 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,2 +1,2 @@
-DIST opera-developer_53.0.2880.0_amd64.deb 54207438 BLAKE2B 0e2f9dd67b3e10badad0ae15d940637a54a8d490eb0522a6e257d161e12a73776aed8b78f8d1e87a7632126fdea8864cf3220a0df16396b0bdcb1c9554a341d7 SHA512 25b49c1aabf9e05d47cb19847f224b53ad3053217c033775b7eaa728eba3f3ba0019997cf88f985366f7c5092bbfc2b3b75cf7c1de4a452c2a2cb9a347751413
 DIST opera-developer_53.0.2885.0_amd64.deb 54539420 BLAKE2B adda26647ef8b194ce1c99f0ad3d963ce35c2a7957a3150c01bc420b6eef59806a1ab807f49d64931c72e23e215db5f99d5aadbb72de680c2a7ea9619c1799ae SHA512 ef9398b3c090e7a77654943a2b394960604859d4daf133f1bc1b713523edfb4eafcd8e7f9b3023142a9115043ce3bedb6a9db0fc48d27007c145dedf8455c4d0
+DIST opera-developer_53.0.2893.0_amd64.deb 54587290 BLAKE2B fd551f17bc15235908723b6ecf5c5c21443317a22d0b1fc359191084744c5d88070a2d16c6deedd8aff0d1a7b415574d2455328f5d2805dc89fe6f06bc2741f5 SHA512 72d4bd41d48f43c450c6a27cd19503c0e9f8c2b7ddd950697026f0d6b462eed34de278d2ab3fe70c56275473b1237559548ea2694d1d94a0e5d67a754466b2fa
diff --git a/www-client/opera-developer/opera-developer-53.0.2880.0.ebuild b/www-client/opera-developer/opera-developer-53.0.2893.0.ebuild
similarity index 100%
rename from www-client/opera-developer/opera-developer-53.0.2880.0.ebuild
rename to www-client/opera-developer/opera-developer-53.0.2893.0.ebuild
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index d1372defe7ce..a814e1a75c70 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1,2 @@
-DIST qutebrowser-1.0.4.tar.gz 3354132 BLAKE2B 272372eee5e59f4f53ab53b535bdc504176e9ae91181ea96063bac3be827bf681539bab52af0be5bc55da4663c4f5b83edc7aa99d54dccd848c3c7bd38b48759 SHA512 197188e1145dcd59089efe4162e471c4d947e84aff2b0dd30582e19d0045a442e81d388e154335e5cce62dd132d379353db932825dbd2cd041372cca795f3e77
 DIST qutebrowser-1.1.1.tar.gz 3472250 BLAKE2B 148450e694f220468916aa45cd7528b393ab1b06ceb516af8a560a160317af584282860652e4ce84ea660c9936075d51755f170cb20e61c0c5e3fb79c6ef0e52 SHA512 30c3aa9883a1d291dba1298c29ff1a47bb90b2db8bda440f1d24983f7b93e7b77b0061e3fdca59f1e725ae639bb47b9f34fc5884b2afd506d2acafb6a6ee271d
+DIST qutebrowser-1.2.0.tar.gz 3625921 BLAKE2B 15fe2a049d0ef1ed7396c89fd4a308230c204ce236489abed5f3921a9d290eaece8300661d2420d6f80b0e95236ff80111f1833b070edeb1b4e76a71667f64cb SHA512 1ddceb00dbf9a623b303a0c3ebcc8eca5e86a519e21fcffda88ab3f7cfe97a8d0d9443e21b04ff0668187274ccd8089a09b41e8da7c423e4668dc554f14e27d3
diff --git a/www-client/qutebrowser/qutebrowser-1.0.4.ebuild b/www-client/qutebrowser/qutebrowser-1.2.0.ebuild
similarity index 98%
rename from www-client/qutebrowser/qutebrowser-1.0.4.ebuild
rename to www-client/qutebrowser/qutebrowser-1.2.0.ebuild
index cf674525e31a..e7535337c44e 100644
--- a/www-client/qutebrowser/qutebrowser-1.0.4.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 5da2f617ca1e..f574c34dc61b 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index a64fe5e26b54..874dbfb76b2c 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-beta_65.0.3325.124-1_amd64.deb 53259128 BLAKE2B ccfcb42533fa01d84eaa1feb24ce9ef7e867f2a317c78cfa6c33ea3f5689a94ec23142e41ae84db9535c4b45d09bea485adca8a29373076d8cf1892f7980649b SHA512 5aaee0742ebf1c1e44862ad532879491091bcd54e9d2a8545e812682d4919cd21f5287edbff9c3114da2ff670cbe5b66a5bdb535b1e9869cebda24c819aadf6a
 DIST google-chrome-stable_65.0.3325.146-1_amd64.deb 52124836 BLAKE2B 0ab436d670464fa7e644262ca03fb2a24fcd0d9c080d725c6df87a5c1bdb55287e7dfc3baf903e07ad556b4a1c5237fb3b7283df68a12f4ec4ea996c40e033e3 SHA512 1ddcbc1d98ab810e7efda676c1c2158a1a8cbe4827bfaa57377290181da8a7bf73588f56eea17cceab2fcdcc606c915c89ceeb5103d6ad869c05699ac5067799
-DIST google-chrome-unstable_66.0.3359.22-1_amd64.deb 53240502 BLAKE2B 3abc0a3d0b717effe3af983852ef898c79afecb833e7b1b813363f9aae4d6d0690e46a28f1248f86a4f201a43933d434e1fb2f1b8bb33c25965dad3eca10e759 SHA512 e9c9686c8c2b984d5f419fec10b165a8cf324f4ec773291027f233a678945ac0e3756c46a956ed821c31e4a51bf578559e613a49e8753799b45a20924a199914
+DIST google-chrome-unstable_66.0.3359.26-1_amd64.deb 53206848 BLAKE2B bbec089ff647b50886fbe0fb0693fb169ecc4f6129e765a14a34c4013272396521f399448b675af3d5436c0179766ed4629630f2d3df272d7ee1f8e932230d15 SHA512 fad3a2cf5215d1c84bc4ad403903463afcf4072fd63aaeaa63ea0f2cf28347e827697c1ebe74b75759e3b72e1389a94443ab81424acfd542aca33caa8932ca66
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.22_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.26_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.22_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.26_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index b421c25cb162..0091131ab71b 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/varnish/varnish-4.0.5.ebuild b/www-servers/varnish/varnish-4.0.5.ebuild
index 33ea75412cb9..dd9c1ab25220 100644
--- a/www-servers/varnish/varnish-4.0.5.ebuild
+++ b/www-servers/varnish/varnish-4.0.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy )
 inherit user autotools systemd python-r1
 
 DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
+HOMEPAGE="https://varnish-cache.org/"
 SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
 
 LICENSE="BSD-2 GPL-2"
diff --git a/www-servers/varnish/varnish-4.1.8.ebuild b/www-servers/varnish/varnish-4.1.8.ebuild
index fb6b3b4964e1..a2b684287b9d 100644
--- a/www-servers/varnish/varnish-4.1.8.ebuild
+++ b/www-servers/varnish/varnish-4.1.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy )
 inherit user autotools systemd python-r1
 
 DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
+HOMEPAGE="https://varnish-cache.org/"
 SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
 
 LICENSE="BSD-2 GPL-2"
diff --git a/www-servers/varnish/varnish-5.1.3.ebuild b/www-servers/varnish/varnish-5.1.3.ebuild
index 851375c6fdc8..c7269e2396f9 100644
--- a/www-servers/varnish/varnish-5.1.3.ebuild
+++ b/www-servers/varnish/varnish-5.1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit user autotools systemd python-r1
 
 DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
+HOMEPAGE="https://varnish-cache.org/"
 SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
 
 LICENSE="BSD-2 GPL-2"
diff --git a/www-servers/varnish/varnish-5.2.1.ebuild b/www-servers/varnish/varnish-5.2.1.ebuild
index 3a01a4558676..5b3698dea93b 100644
--- a/www-servers/varnish/varnish-5.2.1.ebuild
+++ b/www-servers/varnish/varnish-5.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit user autotools systemd python-r1
 
 DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
+HOMEPAGE="https://varnish-cache.org/"
 SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
 
 LICENSE="BSD-2 GPL-2"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index aad63af008b9..c53962c7bb65 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20171018.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20171018.ebuild
index f364cc49df88..d9799aba96c4 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20171018.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20171018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	replace-flags -Os -O2
 	XORG_CONFIGURE_OPTIONS=(
+		--disable-dri1
 		$(use_enable debug)
 		$(use_enable dri)
 		$(use_enable dri dri3)
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 8773ebd1b5d3..87795abcae15 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild b/x11-libs/cairo/cairo-1.14.12.ebuild
index bb7fdfa02ae2..e3cfd44ca758 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
index 834d1ee525f3..698b08005536 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-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 ~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 ~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="X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/libxcb/libxcb-1.12-r2.ebuild b/x11-libs/libxcb/libxcb-1.12-r2.ebuild
index 5310bf7c71f8..5ec2a2ba345b 100644
--- a/x11-libs/libxcb/libxcb-1.12-r2.ebuild
+++ b/x11-libs/libxcb/libxcb-1.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	${PYTHON_DEPS}
 	$(python_gen_any_dep \
-		">=x11-proto/xcb-proto-1.12-r1[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+		"~x11-proto/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
 
 python_check_deps() {
 	has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
diff --git a/x11-libs/snorenotify/files/snorenotify-0.7.0-include.patch b/x11-libs/snorenotify/files/snorenotify-0.7.0-include.patch
new file mode 100644
index 000000000000..ee99e26ed47c
--- /dev/null
+++ b/x11-libs/snorenotify/files/snorenotify-0.7.0-include.patch
@@ -0,0 +1,20 @@
+Bug: https://bugs.gentoo.org/587898
+
+commit 96fd4a7914e8daf924829606dc25f9e4767401dd
+Author: Hannah von Reth <vonreth@kde.org>
+Date:   Mon Nov 21 08:57:00 2016 +0100
+
+    [WIP] Support to build with static Qt and static plugins
+
+diff --git a/src/libsnore/notification/icon.cpp b/src/libsnore/notification/icon.cpp
+index b95ceb4..5c7c139 100644
+--- a/src/libsnore/notification/icon.cpp
++++ b/src/libsnore/notification/icon.cpp
+@@ -25,6 +25,7 @@
+ #include <QNetworkReply>
+ #include <QNetworkRequest>
+ #include <QUrl>
++#include <QTime>
+ 
+ using namespace Snore;
+ 
diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
index ad78029107e1..f814dda6bb2c 100644
--- a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
+++ b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-include.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
@@ -45,10 +48,6 @@ src_test() {
 	virtx cmake-utils_src_test
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 }
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index cb6bd949a18e..e004fcb6fb66 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 84f3db10c488..d3120c352baa 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,2 +1,2 @@
 DIST qt5ct-0.31.tar.bz2 55724 BLAKE2B 54602ee9ed46f790f3a8bc15fa66467382b5830b9a218739bb24483f1f18fe8be8c6a375d83e0b6c02b14bec002aa1e7bf757d6608eb908da0dcf7ced2f6b59d SHA512 9162106febf93b94b8ba847157d20386568bc898d15c6123636ef9d9c50bce3ca4706fbfbfd82053dccf545f91ca40d387d1e9a5bbb6773810a1d931417eaa4e
-DIST qt5ct-0.33.tar.bz2 56448 BLAKE2B d8a94ee847e553a209d4729cbe355a6b9eecd9527774b92cae71011b120d09590601b3d74f883eb1528255a585927f92d7be0da433346cfd44c88a2a01bba50f SHA512 670ec099978b569b7607d6a0af0c7e7b66b4b4a374041893c85a8749992ae6a931fa9678fa122baede8a672c0c9798fad8c30c60205c3f9d0ad3dd867e0753ba
+DIST qt5ct-0.35.tar.bz2 62547 BLAKE2B dd61f151e1c6c58095889b90cb30bb2baaf21fd8f181af37ee43c1d00404655d57c941cee905e737aff29122ae3f588d5c7ba46dc80ca76d749cc2dd66f35d57 SHA512 2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a
diff --git a/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch b/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch
new file mode 100644
index 000000000000..2363e559370a
--- /dev/null
+++ b/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch
@@ -0,0 +1,39 @@
+Index: src/qt5ct/qt5ct.pro
+===================================================================
+diff --git a/src/qt5ct/qt5ct.pro b/src/qt5ct/qt5ct.pro
+--- a/src/qt5ct/qt5ct.pro	(revision 485)
++++ b/src/qt5ct/qt5ct.pro	(revision 486)
+@@ -5,7 +5,7 @@
+ QT += widgets
+
+ greaterThan(QT_MINOR_VERSION, 8) {
+-  QT += gui-private theme_support-private
++  QT += gui-private
+ }
+
+ SOURCES += \
+Index: src/qt5ct-qtplugin/qt5ct-qtplugin.pro
+===================================================================
+diff --git a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro
+--- a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro	(revision 485)
++++ b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro	(revision 486)
+@@ -4,13 +4,14 @@
+ TARGET = qt5ct
+ CONFIG += plugin
+
+-greaterThan(QT_MINOR_VERSION, 7) {
+-  QT += gui-private theme_support-private
+-} else {
+-  QT += gui-private platformsupport-private
+-}
++QT += gui-private
+
+ !equals(DISABLE_DBUS, 1):qtHaveModule(dbus):greaterThan(QT_MINOR_VERSION, 5) {
++    greaterThan(QT_MINOR_VERSION, 7) {
++        QT += theme_support-private
++    } else {
++        QT += platformsupport-private
++    }
+     QT += dbus
+     message(D-Bus support: Enabled)
+ } else {
diff --git a/x11-misc/qt5ct/qt5ct-0.33.ebuild b/x11-misc/qt5ct/qt5ct-0.35.ebuild
similarity index 85%
rename from x11-misc/qt5ct/qt5ct-0.33.ebuild
rename to x11-misc/qt5ct/qt5ct-0.35.ebuild
index 05b743dbdc0a..5c14b1e6072f 100644
--- a/x11-misc/qt5ct/qt5ct-0.33.ebuild
+++ b/x11-misc/qt5ct/qt5ct-0.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,15 +20,17 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dbus? (
 		dev-qt/qtdbus:5
-		>=dev-qt/qtgui-5.7:5[dbus]
+		dev-qt/qtgui:5[dbus]
 	)
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-qtdbus-automagic.patch" )
+
 src_configure() {
-	eqmake5 DEFINES="$(usex dbus '' QT_NO_DBUS)" ${PN}.pro
+	eqmake5 DISABLE_DBUS=$(usex !dbus 1 0)
 }
 
 src_install() {
diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
index 08639af89e26..ab667f7dce1a 100644
--- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,11 +44,11 @@ src_prepare() {
 src_compile() {
 	tc-export CC LD PKG_CONFIG
 
-	emake PREFIX="/usr"
+	emake PREFIX="${EPREFIX}/usr"
 }
 
 src_install() {
-	emake PREFIX="${D}usr" INSTALLMAN="${D}usr/share/man" INSTALLLIB="${D}usr/$(get_libdir)" install
+	emake PREFIX="${ED}usr" INSTALLMAN="${ED}usr/share/man" INSTALLLIB="${ED}usr/$(get_libdir)" install
 
 	dodoc CHANGELIST README
 	if use examples; then